merge with master
authorpimjager <pim@pimjager.nl>
Sat, 14 Nov 2015 13:51:59 +0000 (14:51 +0100)
committerpimjager <pim@pimjager.nl>
Sat, 14 Nov 2015 13:51:59 +0000 (14:51 +0100)

Trivial merge