Merge branch 'unstable' v0.2.26
authorSalim Fadhley <sal@stodge.org>
Tue, 13 Jan 2015 22:25:23 +0000 (22:25 +0000)
committerSalim Fadhley <sal@stodge.org>
Tue, 13 Jan 2015 22:25:23 +0000 (22:25 +0000)

Trivial merge