Sync'd branch central with upstream @ Sat Sep 20 03:18:32 PDT 2014