Upstream, take 2#97
Merged
homunkulus merged 7 commits intomasterfrom Oct 11, 2016
Commits
Commits on Oct 10, 2016
- committedJorge Aparicio
- committedJorge Aparicio
- committedJorge Aparicio
Commits on Oct 11, 2016
- committedJorge Aparicio
- committedJorge Aparicio
- committedJorge Aparicio
- committedJorge Aparicio