Solution for https://issues.jboss.org/browse/AEROGEAR-1000
Merge branch 'AEROGEAR-1000'