oops, bad test case.
Merge branch 'bug-828980' of github.com:nullaus/gaia into bug-828980