Stefano Franz 480698bc46 Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27 ...

# Conflicts:
#	CONTRIBUTORS.md

2018-07-11 11:37:49 +01:00

..

jackson

Merge from O/S

2018-07-05 19:09:25 +01:00

jfx

Removing warnings

2018-07-05 15:45:28 +01:00

mock

Merge from O/S

2018-07-05 19:09:25 +01:00

rpc

Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27

2018-07-11 11:37:49 +01:00