Remove g'aaaaaahhhhh
Merge branch 'eric' into devel