migrations merged since 0015
added defaults for nonempty fields
migration objects are taken from orm object
Merge pull request #383 from xliiv/merging-migration

migrations merged since 0015