Database issues migrating form old version 20150822141540

The PR has been merged. You can give it another try.