Upgraded to .NET 4.5.

Also fixed erroneous commit in previous bugfix.