Update development with master branch

master branch has some things development does not, development needs to be updated. Mostly minor changes and file mode changes.