KEYCLOAK-159
Merge pull request #107 from stianst/master

KEYCLOAK-159