0.2.9
Merge branch '0.3-dev'