Merge branch into master

Working branch is being merged into master.