wisp
 
(Arne Babenhauserheide)
2016-10-31: merge three witches branch again

merge three witches branch again