Merge branch 'master' into GetRidOfCUDA

Conflicts:
	docs/BUILD.md
This commit is contained in:
Jens Steube
2016-01-01 01:09:24 +01:00

Diff Content Not Available