Mattias bugfixes
Merge remote-tracking branch 'origin/Mattias-Break-Test' into Master