0.12.1-alpha1 - an alpha to play with merging