4651: Merge branch 'master' into 4651-boolean-params
authorTom Clegg <tom@curoverse.com>
Mon, 24 Nov 2014 15:51:01 +0000 (10:51 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 24 Nov 2014 15:51:01 +0000 (10:51 -0500)

Trivial merge