Sync'd branch central with upstream @ Tue Aug 26 17:26:32 PDT 2014