Merge pull request #3082 from tobiasd/20170111-newyear
authorMichael Vogel <icarus@dabo.de>
Wed, 11 Jan 2017 07:59:43 +0000 (08:59 +0100)
committerGitHub <noreply@github.com>
Wed, 11 Jan 2017 07:59:43 +0000 (08:59 +0100)
happy 2017


Trivial merge