Sync'd branch central with upstream @ Wed Oct 15 11:32:39 PDT 2014