Merge branch '0.1-maintenance'