AEROGEAR-1006 fixes
Merge branch 'AEROGEAR-1006' of https://github.com/sebastienblanc/aerogear-controller into AEROGEAR-1006
AEROGEAR-1006