Skip to content

Cumulative backport of changes from master through PR 497#498

Merged
hazendaz merged 10 commits intoWaffle:1.8.xfrom hazendaz:1.8.xFeb 7, 2017