Merge branch 'dev'
0.5.4 release