Sync'd branch central with upstream @ Mon Sep 15 14:50:39 PDT 2014