merge https://github.com/dsetia/devstack/pull/15 request from frank-borkin