version 1.2.1-dev
Merge pull request #380 from bblay/v1.2.1-dev

version 1.2.1-dev