Merge branch 'master' into noinitscript noinitscript
Thierry Parmentelat [Sun, 1 Mar 2015 07:26:56 +0000 (08:26 +0100)]
1  2 
system/TestPlc.py

Simple merge