[aerogear-dev] AEROGEAR-574 - pull request