Sync'd branch central with upstream @ Mon Sep  1 18:05:32 PDT 2014