Merge /u/johndemolition/gptfdisk/ branch u into master

https://sourceforge.net/p/gptfdisk/code/merge-requests/17/