Version bump to 2.3.6