Merge branch 'master' into master

diff --cc doc/telestrat.sgml
index 0c85c68c5da0cc8a800a370ec900f5987b91985a,243097a84962cf4ae2bef84ba65e79abc4ab25be..2d05f898539648e432ec553c40349566bc7243d1
--- 1/doc/telestrat.sgml
--- 2/doc/telestrat.sgml
+++ b/doc/telestrat.sgml
@@@ -9,8 -9,9 +9,10 @@@
  <date>2017-01-22
  
  <abstract>
 -An overview over the Telestrat (<url name="Telemon 3.0"
 -url="http://orix.oric.org">) runtime system as it is implemented for the
 -cc65 C compiler.
++
 +An overview over the Telestrat (Telemon 2.4 & Telemon 3.x : http://orix.oric.org) runtime system as it is implemented for the cc65 C
 +compiler.)
++
  </abstract>
  
  <!-- Table of contents -->