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

alkdfjsalkdfj
merge in lastest from shared (work)
james-feature-1
Merge pull request #6 from seanmcmills/feature/james-feature-1

james-feature-1
Merge branch 'release/james-release-1'