Sync'd branch central with upstream @ Sat Aug 30 19:38:31 PDT 2014