Sync'd branch central with upstream @ Wed Sep 17 11:43:34 PDT 2014