KEYCLOAK-530
Merge pull request #470 from stianst/master

KEYCLOAK-530