Batch modification to #452, #454, #455, #457, #458, #459, #461, #463, #466, #467, #477, #479, #483, #486, #487, #65, #167, #218, #238, #313, #314, #366, #395, #396, #398, #478, #480 by mevenson: milestone to 1.9.2