needs changelog entry
fix
moved out of src dir
fixed qt pro
Merge branch 'upstream'