Merge branch 'master' into failed_opens
authorChris Down <chris@chrisdown.name>
Thu, 14 Jul 2016 08:08:48 +0000 (09:08 +0100)
committerGitHub <noreply@github.com>
Thu, 14 Jul 2016 08:08:48 +0000 (09:08 +0100)

Trivial merge