Update upstream#34
Merged
Merged
Commits
Commits on May 2, 2017
- authored andcommitted
- authored andcommitted
- authored andcommitted
- authored andcommitted

- authored andcommitted

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

- committed
Marcelo Vanzin