pull upstream
Makefile now great, sub module patch fixed
Merge branch 'master' into unstable