Fixed incorrect merge of base HISTORY.md from dev-master