Merge branch 'release/1.1.5' into dev
don't display children
bump version
Merge branch 'release/1.1.6'