KEYCLOAK-162
Merge remote-tracking branch 'upstream/master'
Merge pull request #111 from cardosogabriel/master

KEYCLOAK-162