Merge branch 'master' (attempt 2) of https://github.com/miguelgrinberg/Flask-WhooshAlchemy