rebased onto bab5b3bb1e793824eb2533622ad32777a107ac2b
rebased onto b030980798fc601e03c6158c17f35b4b9c8c0ad8
Pull-Request has been merged by kalev