Sync'd branch central with upstream @ Mon Sep 15 11:42:51 PDT 2014