Sync'd branch central with upstream @ Fri Aug 22 16:18:31 PDT 2014