Sync'd branch central with upstream @ Wed Oct  1 14:10:35 PDT 2014