Cherry-Picked from https://github.com/AuScope/VEGL-Portal/commit/9d9dacaee330ab738071fb8b4dd56d9bfe521c0a
Merge pull request #37 from alexkrumpholz/upstream-master

Cherry-Picked from https://github.com/AuScope/VEGL-Portal/commit/9d9daca...