Merge pull request #918 from nomnombtc/patch-1