#961: #946: markup changes
opened by thuchacz