Merge branch 'master' into develop
lorem ipsum removed, target ordered alphabetically
Merge branch 'develop'