Sync'd branch central with upstream @ Mon Oct  6 19:32:39 PDT 2014