closes Zeega/Zeega-Issues#361
Merge branch 'master' into staging