fix compilation #512
Merge branch 'bugs/512'
Merge branch 'master' into cc5