Source

Proposed fix for #1068 / series

Full commit
Bitbucket a07b584 
# Placed by Bitbucket