Fixes #547
This one looks sane to me!
good-to-go!
rebased onto 96ae1437375dbb89e79ffdf0ae6d375762b3ca41
Pull-Request has been merged by abompard
Fixes #547