rebased onto 7913e3005d63c00312588aba9d273f5ed7fe70ce
rebased onto 55011818e389c26c698a05b2f6c9ff570b43ed3b
Pull-Request has been merged by a2batic