Merge branch 'master' of github.com:katalyst/koi
Merge branch 'master' into v1.1.0
Merge branch 'v1.1.0'