DO NOT MERGE: RULE THEM ALL BRANCH

:hand: DO NOT MERGE :hand:

This is my personal PR which contains all my current PRs merged together.

I am exploiting (built-in) Travis CI PR functionality to make sure that all my PRs are nicely playing together.

:hand: DO NOT MERGE :hand: