Fixes issue #345
Merge commit '4b8956638543e4d3c46c4b703bdf2ef88d92a551' into HEAD