fix ftbfs in kFreeBSD
Merge branch 'debian/unstable' into ubuntu/trusty
prepare for upload