Sync'd branch central with upstream @ Tue Sep 30 17:00:41 PDT 2014