updates from casting#3

Merged

Flambe merged 2 commits intomasterfrom

Jul 6, 2018

Commits on Jun 27, 2018

pulled changes from upstream
Flambe
authored

Commits on Jul 6, 2018

fixed closures in where failing
Flambe
authored