pull latest from djk/devel