Lots of updates
Take this and that!

holy moley
Merge remote-tracking branch 'origin/Stryker' into Stryker