Sync'd branch central with upstream @ Mon Oct 20 18:10:45 PDT 2014