Merge branch 'SeanRBurton-master'
authorDuncan Coutts <duncan@community.haskell.org>
Thu, 1 Sep 2016 13:31:24 +0000 (14:31 +0100)
committerDuncan Coutts <duncan@community.haskell.org>
Thu, 1 Sep 2016 13:31:24 +0000 (14:31 +0100)

Trivial merge