Merge pull request #716 from jlipps/master

misc fixes (including #715, #713)
fix mobile: reset for ios