Sync'd branch central with upstream @ Wed Sep  3 13:41:34 PDT 2014