posixninja Merge branch 'jg'