Sync'd branch central with upstream @ Mon Sep  1 17:49:22 PDT 2014