Sync'd branch central with upstream @ Tue Sep  2 11:00:33 PDT 2014