Remove conflict between min/max macro in windows.h and std::min/max

Requesting merge.  The bug is [here](http://freecadweb.org/tracker/view.php?id=1535).