Merge pull request #890 from xoofx/master