Sync'd branch central with upstream @ Mon Oct 13 18:21:40 PDT 2014