okay this is strange
scripted update of code from master at 68ee46a okay this is strange