Merge branch 'master' of https://github.com/aarnt/octopi
Changes in CHANGELOG file