rebased onto f216c8d165803ff3ace751c3eed044b84396ee89
Looks good, thanks!
Pull-Request has been merged by pbokoc