Merge remote-tracking branch 'origin/master'
authorNikolaus Rath <Nikolaus@rath.org>
Fri, 13 May 2016 20:14:11 +0000 (13:14 -0700)
committerNikolaus Rath <Nikolaus@rath.org>
Fri, 13 May 2016 20:14:11 +0000 (13:14 -0700)

Trivial merge