Rejected PR https://github.com/aerogear/aerogear-unifiedpush-server/pull/297 as it needs some more work.