Merge branches 'master' and 'master' of https://github.com/luisgg/aurex-artwork
mdm migrated to upstart