1.2.0 prep

Bugfix or feature?