Sync'd branch central with upstream @ Wed Sep 17 11:35:47 PDT 2014