Team Octopus - Trailer 1.0.16

Includes 1.0.15 and 1.0.16 changes