merge Cameron's 2.3.6 official release into master