Merge branch 'develop'
fixes for references
Merge branch 'master' into develop