Sync'd branch central with upstream @ Wed Oct 29 13:36:11 PDT 2014