Merge branch 'micah/platform-commit_template'
authorkwadronaut <kwadronaut@leap.se>
Wed, 26 Jul 2017 09:20:21 +0000 (11:20 +0200)
committerkwadronaut <kwadronaut@leap.se>
Wed, 26 Jul 2017 09:20:21 +0000 (11:20 +0200)

Trivial merge