FIXED: problems with XESScanActionController introduced with #949
Merge branch 'master' of github.com:acquaman/acquaman