Merge pull request #2160 from remakeelectric/app-mosq