* Makefile build fix.
Merge branch 'master' into stable