Sync'd branch central with upstream @ Mon Sep  8 02:32:32 PDT 2014