actually use commit from master branch for 0.5.18, broken 0.6.1 with --devel