Merge pull request #1581 from jlipps/master

make sure to reset command timeout during mobile: reset (fix #1579)
retina shouldn't be default for ios 6