Merge branch 'release/v2.3' into develop
normalize line endings
use ini_set to change default_socket_timeout setting from 1min to 10mins
repacked
updated version to 2.31 in the xml and re-packed
clean-up line ending
Merge branch 'release/v2.31'