merge final bits of 0.3.x-cmake into experimental