Merge branch 'master' into devel
Workaround for shared folder permissions issue in virtualbox.
Merge branch 'devel'