Merge pull request #5 from seanmcmills/release/release-7-from-work

Release/release 7 from work
Merge tag 'release-7-from-work' into develop

alkdfjsalkdfj