Fix for bug #2609
Merge branch 'master' of https://github.com/inverse-inc/sope