Fixes: #372
rebased onto 0b6d61ab3b5d1b6d31db10e61b7f40609fb3682c
rebased onto 4621ad8505432bcee9ae68e37ea744a686e8af34
:thumbsup:
rebased onto ecd70d8dd9ceeca4e8d429f931a0ec4fd837e69a
Pull-Request has been merged by ngompa
Fixes: #372