Sync'd branch central with upstream @ Tue Sep  2 09:55:34 PDT 2014