Changes since tag 6.0

commit dd2ac6752ecfff3572201468d850a306e1c70cee
Author: zanony <zanony@jsommer.at>
Date:   Sun Aug 5 21:32:44 2018 +0200

    Fix error that ChocolateBar can not be found

