Partially closes https://gitlab.com/commento/commento/issues/136
Closes https://gitlab.com/commento/commento-ce/issues/66