Update 15/10

Merging UnivUnixMockup from Ferthedems with master.