Update master

Merged Mark OLESEN requested to merge update-master into master

Update master to include stable development changes and bugfixes.

Merge request reports