hot fixes for 4.0.7

didn't commit hot fix i put out for 4.0.7 way back when I committed it to WP SVN, putting it in now