jl2 Merge branch 'patchyderm-master'