Sync'd branch central with upstream @ Tue Sep 23 15:46:39 PDT 2014