Merge branch 'release/v1.1'
Merge branch 'release/v1.1'
typeo fix
Revert "typeo fix"

This reverts commit cacea2dfb1b8d119ec20a378bf242d9c629af5fa.
typeo
Merge branch 'master' into develop