Rolf - 2016-08-17

I believe this works now at least in 3.0.1