Merge commits from main repository

- [ft] Committed Instant Messsenger Connector is now guarded against broken IM data
- [ft] Corrected an exception leave path in inventory handling
- [aliciaraven]  	integrated opensim-git 04aa13a086239b8d628821809bef9c9585c35f8f: