Merge trunk
into feature/modules-to-plugins
#1007
Closed
Loading
trunk
into feature/modules-to-plugins
#1007