Merge from wolfgangmm:master