Merge branch '1946-request-body-vs-parameters'
authorTom Clegg <tom@curoverse.com>
Mon, 27 Jan 2014 21:17:55 +0000 (13:17 -0800)
committerTom Clegg <tom@curoverse.com>
Mon, 27 Jan 2014 21:17:55 +0000 (13:17 -0800)
closes #1946


Trivial merge