Merge branch 'master' into develop
Add 'color' accessor tests
Add 'text' accessor tests
Merge branch 'develop'