Add this to the changelog
Merge pull request #523 from alex/changelog

Add this to the changelog
Merge branch 'master' into pbkdf2-openssl

* master:
  Add this to the changelog

Conflicts:
	docs/changelog.rst