Merge branch 'master' into next
authorArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Wed, 9 Aug 2017 22:32:51 +0000 (00:32 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Wed, 9 Aug 2017 22:32:51 +0000 (00:32 +0200)
This is in preparation of bumping the stella package, which is also
modified in master.


Trivial merge