Tribler/tribler — pull request #835 by LipuFei (2014-09-08 10:25:10+00:00)
Title: Merge next back to devel

Also fixes #833