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