Last commit from popcorn-time: master