catch up mupdf master branch
Merge pull request #216 from chrox/master

catch up mupdf master branch