Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 1 Jan 2017 01:24:17 +0000 (02:24 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 1 Jan 2017 01:24:17 +0000 (02:24 +0100)
* maint:
  Update copyright year to 2017.


Trivial merge