Forgot to include file
Merge branch 'develop' into release-1.1.0