Merge branch 'master' into fix-documentation-build-process
authorMatthew Setter <matthew@matthewsetter.com>
Tue, 21 Feb 2017 11:07:57 +0000 (12:07 +0100)
committerMatthew Setter <matthew@matthewsetter.com>
Tue, 21 Feb 2017 11:07:57 +0000 (12:07 +0100)

Trivial merge