1.0.0 release merge

Ryan Berkheimerrequested to merge
mac-develop into master

merging mac-develop into master for 1.0.0 release.

Merge request reports