Merge branch 'notandt push origin mastery-master'
authorSuperBFG7 <daniel@despite.ch>
Sun, 14 Feb 2016 11:34:13 +0000 (12:34 +0100)
committerSuperBFG7 <daniel@despite.ch>
Sun, 14 Feb 2016 11:34:13 +0000 (12:34 +0100)

Trivial merge