Merge branch 'master' into erwins
Merge branch 'master' into erwins
Accounted for comments by Elias
Merge branch 'erwins'