Sync'd branch releases/release with upstream @ Thu Oct 30 12:36:24 PDT 2014