Merge branch 'camil-w3'
authorCamil Staps <info@camilstaps.nl>
Thu, 26 Feb 2015 17:27:14 +0000 (18:27 +0100)
committerCamil Staps <info@camilstaps.nl>
Thu, 26 Feb 2015 17:27:14 +0000 (18:27 +0100)

Trivial merge