Merge topic 'vs2013_fixes' into pv-master

4228c2d8 Add missing <algorithm> include. Needed for std::max/min.
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I0b7c13f3a92663b472d99d42c992570a84f7fdf4