Merge branch 'master' into issue-1262
authorKim Kulling <kimkulling@users.noreply.github.com>
Tue, 16 May 2017 19:53:35 +0000 (21:53 +0200)
committerGitHub <noreply@github.com>
Tue, 16 May 2017 19:53:35 +0000 (21:53 +0200)

Trivial merge