Sync'd branch central with upstream @ Fri Sep 19 10:56:39 PDT 2014