Update upstream#40
Merged
Merged
Commits
Commits on May 8, 2017
- authored andcommitted
- authored andcommitted
- authored andcommitted

- authored andcommitted
- authored andcommitted


- authored andcommitted
- authored andcommitted
- committed
Nick Pentreath - authored andcommitted
