Update upstream#36
Merged
GulajavaMinistudio merged 6 commits intoGulajavaMinistudio:masterfrom May 5, 2017
Merged
Commits
Commits on May 4, 2017
- authored andcommitted

- authored andcommitted

- authored andcommitted

- authored andcommitted

- committed
- authored andcommitted