Merge branch 'terencehill/powerup_randomness_2'
authorterencehill <piuntn@gmail.com>
Fri, 30 Mar 2018 23:00:25 +0000 (01:00 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 30 Mar 2018 23:00:25 +0000 (01:00 +0200)

Trivial merge