Sync'd branch releases/release with upstream @ Mon Aug 25 15:38:14 PDT 2014