Merge pull request #241 from dejan-brkic/2.3.x

CRAFTERCMS-841
v2.3.6 Release
prepare for next development iteration