every time you don't put a bracket on a new line, god kills a kitten.

PLEASE. THINK OF THE KITTENS.
Merge branch 'master' into T1