Sync'd branch central with upstream @ Wed Oct 29 13:50:33 PDT 2014