This Fixes #788
artifacts
Merge branch 'pr/941' into develop

Conflicts:
	htdocs/js/rcloud_bundle.min.js