Sync'd branch central with upstream @ Fri Aug 22 16:49:32 PDT 2014