Merge branch 'nihlus_fscheck_testing2' into fscheck_testing
authorvaron <varon@users.noreply.github.com>
Fri, 2 Jun 2017 11:49:46 +0000 (13:49 +0200)
committervaron <varon@users.noreply.github.com>
Fri, 2 Jun 2017 11:49:46 +0000 (13:49 +0200)

Trivial merge