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)
commit3f68278ea0d8db8e03a1ddd7f65de7282af05726
treed3b13b956670c7dd3ada87e563dba0257d9812e7
parent6c70edaf284370e03757a6d7241e4988cf88b246
parentff7624f06fe076951b5a99614b0e3cd051c389f1
Merge branch 'master' into issue-1262