More merging from OST-Todos.  Fixed namespace issue in Migrations.