Sync'd branch releases/release with upstream @ Mon Aug 25 11:44:30 PDT 2014