Merge branch 'release/1.5.5'
Merge branch 'develop'
Merge branch 'release/1.5.5'
Merge branch 'release/1.5.5.1'
Updated structure for proper auto-loading
Release prep
Merge branch 'release/1.5.5.2' into develop