Sync'd branch central with upstream @ Thu Aug 28 13:16:36 PDT 2014