in the middle of crossterms
Merge branch 'devel' of github.com:SheffieldML/GPy into devel