Adding new VERSION entries for HISTORY.md files
Merge dev-master into dev-3.x and resolve merge issues with history