#drupalcon2016

#151 works fine on D10.3.3 for me too, thanks

I just verified that the patch in #151 works fine in 10.3.3

Re-rolled for 10.3.3. Did not include change from #138 as not sure whether that is required. Need to test to see if it works.