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

- authored andcommitted
Commits on May 9, 2017
- authored andcommitted

- authored andcommitted


- committed
Nick Pentreath - authored andcommitted

- committed
- authored andcommitted
- authored andcommitted
- authored andcommitted


- committed
- authored andcommitted
- authored andcommitted
- committed
- committed