Merge branch 'PR1591'
authorNicolas Thill <[email protected]>
Tue, 4 Aug 2015 00:15:40 +0000 (02:15 +0200)
committerNicolas Thill <[email protected]>
Tue, 4 Aug 2015 00:15:40 +0000 (02:15 +0200)

Trivial merge