Merge branch '3.0' of http://www.iramuteq.org/git/iramuteq into 3.0