remove testling-related things
Merge branch 'master' into jhbate/createmessages