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