Sync'd branch central with upstream @ Tue Aug 26 16:47:33 PDT 2014