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