Sync'd branch central with upstream @ Fri Oct 24 15:07:43 PDT 2014