Commit 86704de8380cf9b19f03c6096140694553e7904b

Stephen Moloney 2017-03-02T23:10:01

resolve conflict with Kernel.apply