Merge branch 'master' into NETCONN
NETCONN had most up to date changes and evolved to be much more stable than master therefore it had to become the new master.
This commit is contained in:
NETCONN had most up to date changes and evolved to be much more stable than master therefore it had to become the new master.