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