Merge branch 'master' into gnu-pth-sim