Preparing for Kinetic Sync 2018-10-11

Hi Tully,

it would be nice to include this PR in the sync. Many of our code depends on this change and locally, at our lab, everything works fine with the same change. Since I was stuck, could you look at it?