Merge tag '3.0.7' into develop

Version 3.0.7
Inject merged columns in article column selection.
Call the previous tl_article.inColumn options callback, before invoke the own logic.
Merge branch 'release/3.0.8'