Merge 16070:16110 from trunk.
[rails.git] / db / MAKE_MIGRATIONS_AND_TEST_THEM_DONT_PUT_SQL_HERE_ANY_MORE