Sync'd branch central with upstream @ Fri Sep  5 08:56:30 PDT 2014