KEYCLOAK-532
Merge pull request #469 from stianst/master

KEYCLOAK-532