Build #79:   Merge pull request #122 from skellock/fix/121 on branch master over 7 years ago