eb621e
Merge branches 'users/dmueller/master/for-next' and 'users/nsaenzjulienne/master/for-next' into master Pull an arm config update from Dirk Müller. Pull a feature implementation and config update from Nicolas Saenz Julienne.