Merge "Merge commit '00cb6417' into master.  Doesn't turn on the debugging."