bugfix #305
Merge origin/testing into testing