Removed exception that only allows for text attribute
Merge branch 'master' into develop