Sync'd branch releases/release with upstream @ Mon Aug 25 20:08:28 PDT 2014