Sync'd branch central with upstream @ Wed Sep 24 13:03:39 PDT 2014