Merge from popcorn-time:master