aerogear-controller merged as f07f3c54d3cb3dd09fcebf1a83342e3cb266dce5

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira