Incorporate changes from https://github.com/webedx-spark/Priam/commit/4052c66f5312d619e614d418c9b998523e750a20
Merge pull request #291 from timiblossom/1.2

Incorporate changes from https://github.com/webedx-spark/Priam/commit/40...