0.13 release
Merge branch 'master' into dev