fixed failing tests, resolved merge conflicts on #1428#2092
Merged
gwyneplaine merged 1 commit intomasterfrom Oct 25, 2017
Merged
fixed failing tests, resolved merge conflicts on #1428#2092gwyneplaine merged 1 commit intomasterfrom
gwyneplaine merged 1 commit intomasterfrom
