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