Sync'd branch central with upstream @ Wed Oct 22 17:51:45 PDT 2014