REL: bumped to 2.1.2-dev
Merge pull request #578 from wasade/bump_to_2.1.2-dev

REL: bumped to 2.1.2-dev