Shane T Mueller - 2017-03-03

Thanks. I'm testing it and will commit it to the 2.0 branch.