Fix HISTORY
Merge branch 'develop'