Merge MVC5_EF6 fixes