Replace MIN and MAX with std::min and std::max where possible.
Merge branch 'master' into engine-upgrade/c++
Get rid of Q_bound() and add Maths.h.
Fix a naming error.
Get rid of Q_clamp where possible.
Merge branch 'engine-upgrade/c++'