Sync'd branch central with upstream @ Tue Aug 26 12:58:34 PDT 2014