Summary:
Merge branch 'dev' of github.com:BastiaanGrisel/NAO into dev