Sync'd branch releases/release with upstream @ Thu Oct 23 05:29:40 PDT 2014