Merge branch '11168-serialize-json'
authorTom Clegg <tom@curoverse.com>
Fri, 3 Mar 2017 21:46:50 +0000 (16:46 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 3 Mar 2017 21:46:50 +0000 (16:46 -0500)
closes #11168


Trivial merge