Merge remote-tracking branch 'upstream/master'
Bugfix for un-needed migration
Merge pull request #171 from robotmay/master

Bugfix for un-needed migration