Sync'd branch central with upstream @ Fri Oct  3 13:07:41 PDT 2014