multiple changes / bugfixes before next release
Authored by: myha 2015-11-08
Parent: [r563]
Child: [r565]