Merge branch 'dev' of dl:dylansserver into dev