Sync'd branch central with upstream @ Mon Sep 22 04:07:37 PDT 2014