Merge branch 'master' into feature/net_standard_switch

This commit is contained in:
Serraniel 2017-10-26 19:05:54 +02:00
commit 8befa25050