Merging updated master branch

Merge branch 'master' into basic-styling