Sync'd branch releases/release with upstream @ Thu Oct 23 11:59:38 PDT 2014