Merge branch '4434-collation' closes #4434
authorTom Clegg <tom@curoverse.com>
Wed, 12 Nov 2014 18:42:51 +0000 (13:42 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 12 Nov 2014 18:42:51 +0000 (13:42 -0500)

Trivial merge