Merge branch 'master' into check-updates

This commit is contained in:
Gav Wood
2016-12-04 09:01:50 -08:00
280 changed files with 5818 additions and 4269 deletions