Sync'd branch central with upstream @ Tue Sep 16 17:08:38 PDT 2014