rebased onto 81b199a92d7dd7563652595bb032f0132bc60d61
:thumbsup:
Pull-Request has been merged by jkaluza