fixes
Merge branch '0.13'