Team Octopus/Trailer 1.0.12

This started as the 1.0.11 branch but got intertwined with the 1.0.12 feature set, now that 1.0.12 is out it may as well be the merge point.