Simplified line
Merge branch 'devel' of github.com:Devristo/tribler into devel