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)
commit4c5b02e57116452fce1b8428a7040554f3a350d7
treee594c5a9f08ce34d161ffd024c2af37a1ac2612b
parent72e89edfcb9821121a2785ddf193a1d836ae0b8f
parent128a16aceeb43d7d22b10c6845f7c4d09439e031
Merge branch 'master' into next

This is in preparation of bumping the stella package, which is also
modified in master.