Source

Proposed fix for #1068 / series

Full commit
# Placed by Bitbucket