Merge branch 'master' into duplex
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 May 2016 03:58:50 +0000 (05:58 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 May 2016 03:58:50 +0000 (05:58 +0200)

Trivial merge