Fixes #115
Merge branch 'master' into t115_remove_lccall