fix #1597
Merge branch 'master' of https://github.com/radare/radare2