Fixing @garyservin's snafu
Merge branch 'hydro-devel' into android