Fix merge issue

Version 2.20.1

Version 2.20.0

Version 2.19.0

Verson 2.18.2

Version 2.18.1

Merge branch 'develop'

Version 2.17.0

Version 2.16.2 (picklesdoc#483)

* Pickles is unable to deal with Danish characters (picklesdoc#477)

* Version 2.16.2

Merge branch 'develop'