Merge remote-tracking branch 'github/merge-requests/464'
authorKlaus Ethgen <Klaus@Ethgen.de>
Sat, 8 Jul 2017 09:32:34 +0000 (10:32 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sat, 8 Jul 2017 09:32:34 +0000 (10:32 +0100)
* github/merge-requests/464:
  Eliminate some deprecations


Trivial merge