Merge branch 'topic/pr-935' into develop

James Moger

2015-10-05 1c261bd5fbe8f4750f17678f85f98cf101439b71

1
2
3
4
[user "admin"]
    password = admin
    role = "#admin"
    role = "#notfederated"