Backport devel makefile to stable for consistent testing.
Merge pull request #583 from sinzui/backport-makefile-for-testing

Backport devel makefile to stable for consistent testing.