Merge branch 'master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 7 Aug 2016 07:26:22 +0000 (09:26 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 7 Aug 2016 07:26:22 +0000 (09:26 +0200)

Trivial merge