Fix for #121 in stable
Fix for #121 on master

(Merge remote-tracking branch 'origin/master' into gh-121-travis1)
Fix for #121 in stable
Merge branch 'stable'
Merge branch 'gh-121-travis1'