Updates for Stark
Merge branch 'icee' of https://bitbucket.org/jongchoi/adios-1.7.0-icee into icee