Sync'd branch central with upstream @ Fri Oct 31 06:10:39 PDT 2014