Resubmitting PR #157 in 2.1 branch
Merge pull request #158 from Ascarius/2.1

Resubmitting PR #157 in 2.1 branch
Update changelog.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>