Fix master

@MatthiasBrantner Ready for review. Not sure how this was not caught by the old travis (it's a regression from the xqdoc branch).