Merge remote-tracking branch 'origin/master' into check-updates

This commit is contained in:
Gav Wood
2016-11-27 15:01:17 +01:00
73 changed files with 1342 additions and 609 deletions