Merge branch 'devel'
Merge branch 'devel' into sp
Working on ioUtil tests and ioUtil source.
Merge branch 'sp' into devel
Merge branch 'sp'
Merge branch 'devel'