Merge branch 'master' into development
Strip out html tags
Merge branch 'development'