Merge pull request #4079 from antonlacon/sqlite3-3.17.x