Fix for Item.factory when a source doen't have a 'type'
pulled in fix to item factory and rolled version #