Merge branch 'ryansmith94-patch-1' into develop
Merge branch 'master' into develop