Small upstream merge
Small upstream merge

olunx/libmtp,jemc/libmtp,Bluerise/libmtp,yifanlu/libMTP,Bluerise/libmtp,kbhomes/libmtp-zune,mmalecki/libmtp,mmalecki/libmtp,kbhomes/libmtp-zune,philipl/libmtp,yifanlu/libMTP,philipl/libmtp,libmtp/libmtp,reverendhomer/libmtp,libmtp/libmtp,reverendhomer/libmtp,olunx/libmtp,reverendhomer/libmtp,jemc/libmtp,reverendhomer/libmtp,pierrezurek/libmtp,pierrezurek/libmtp,olunx/libmtp,libmtp/libmtp,mmalecki/libmtp,Bluerise/libmtp,philipl/libmtp,vmandela/libmtp,jemc/libmtp,jemc/libmtp,vmandela/libmtp