Sync'd branch central with upstream @ Mon Sep 29 12:21:39 PDT 2014