Merge branch 'dev'
0.11.4 release
Merge branch 'master' into dev