Sync'd branch central with upstream @ Fri Sep  5 03:13:35 PDT 2014