Sync'd branch central with upstream @ Wed Sep 10 06:07:36 PDT 2014