Dev branch should now match master branch after some confusion.
Merge branch 'dev'