Updated CHANGELOG
Merge pull request #1140 from untergeek/1.4.x

Updated CHANGELOG