Merge branch 'master' into processing

This commit is contained in:
chrys 2017-07-27 00:05:46 +02:00
commit 1fec8bd464