Merge pull request #1949 from compwright/develop

Added support for timestamp-based migrations