Sync'd branch central with upstream @ Mon Sep 22 12:29:35 PDT 2014