Add new colormap for with_attachement
Merge remote-tracking branch 'upstream/master'
add template