Fun fun fun.
Removed silly comma
Merge branch 'master' into bachelor
At least try to reduce size
Merge branch 'master' into bachelor
Style fix
Merge branch 'master' into bachelor
large parts of the clusterfuck cleaned
Merge branch 'master' into bachelor