Merge MVC5 branch into master

Merge MVC5 branch into master