Merge changes in master into develop.

Made a few changes in master that need to be merged into develop before work can continue.