Merged tiaitsch85:patch-1