Sync'd branch central with upstream @ Mon Sep  8 16:10:33 PDT 2014