Merge branch 'master' of ssh://libmtp.git.sourceforge.net/gitroot/libmtp/libmtp