Sync'd branch central with upstream @ Sat Sep 13 10:10:36 PDT 2014