Build correct JSON responses from SimpleIO as well.
Merge branch 'master' into support/2.0