Re-merge upstream master with the 3.5 fork

This re-merges this fork with https://github.com/SamSaffron/MiniProfiler, adding in all the new features.