Merge branch 'anguslees-master'
authorStefan Junker <mail@stefanjunker.de>
Tue, 17 May 2016 16:36:38 +0000 (18:36 +0200)
committerStefan Junker <mail@stefanjunker.de>
Tue, 17 May 2016 16:36:38 +0000 (18:36 +0200)

Trivial merge