Merge pull request #991 from rleigh-dundee/ice35-develop

Add support for Ice 3.5 (develop)
Update develop submodules