Squash all of my commits into a single one and merge into master by Juri Strumpflohner