Version bump and HISTORY update
Merge branch 'develop'