Merge pull request #25 from garyservin/android

Bring fix from hydro-devel-fixed
Fixing @garyservin's snafu
Merge branch 'hydro-devel' into android