1.7:
-----
 * Fix and improve markup_element check for consistency