add explicit import of <algorithm> to resolve build problem on VS2013
Merge branch 'master' into fmcs_port_21Feb2014