Sync'd branch central with upstream @ Wed Sep  3 19:35:34 PDT 2014