Merge remote-tracking branch 'origin/master'
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Thu, 11 Aug 2016 03:41:47 +0000 (20:41 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Thu, 11 Aug 2016 03:41:47 +0000 (20:41 -0700)

Trivial merge