Checkit, we got some bjorklund up in here
Merge branch 'euclidean'

* euclidean:
  Checkit, we got some bjorklund up in here