Merge remote-tracking branch 'upstream/master'

diff --git a/osm2pgsql b/osm2pgsql
index d1d82e5fe6b3087d5b14ecddaf5d0e983f13aa26..49089cb1a3c72ad97b57db21716a5fa07d4f2f8a 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit d1d82e5fe6b3087d5b14ecddaf5d0e983f13aa26
+Subproject commit 49089cb1a3c72ad97b57db21716a5fa07d4f2f8a