Sync'd branch central with upstream @ Fri Sep 12 04:52:36 PDT 2014