Aksarinc master patch 95995

aksarinc kajon requested to merge aksarinc/plain-html:aksarinc-master-patch-95995 into master Jan 04, 2020