Version 0.5.14
Merge branch 'v0.5'