Merge branch 'release/1.1'
Fix formatting