Sync'd branch central with upstream @ Tue Sep 30 20:38:39 PDT 2014