bugfix #305
Merge testing into develop
Merge origin/develop into develop
Merge github/develop into develop