Sync'd branch central with upstream @ Sat Aug 30 09:41:33 PDT 2014