Sync'd branch central with upstream @ Fri Sep 26 13:55:39 PDT 2014