backported some fixes done in qtSkeleton
Merge branch 'master' into rembrandt