Merge branch 'GetRidOfCUDA'
authorJens Steube <jens.steube@gmail.com>
Fri, 1 Jan 2016 00:09:57 +0000 (01:09 +0100)
committerJens Steube <jens.steube@gmail.com>
Fri, 1 Jan 2016 00:09:57 +0000 (01:09 +0100)

Trivial merge