[1d6514]: Merge branch 'bug-18870-SVM-Integrationbranch2'

Merged commits:

2015-08-03 11:09:30 Alex Tschlatscher [966f45]
add english comments.