submitted again to both stable and master branch, as it appears noone merged stable into master before putting it into stable :-((