rebased onto 058d4c97e9ee46df2d5a347a5e0e6312672dd51b
Thanks. Merged.
Pull-Request has been closed by ppisar
You changed your commit after I applied it. I corrected the builtime in a separate commit.