Sync'd branch central with upstream @ Wed Sep  3 11:55:33 PDT 2014