Sync'd branch central with upstream @ Fri Aug 29 12:23:23 PDT 2014