grim/testing

grim/testing/
Merged TALOS-CAN-0143
release-2.x.y
2016-06-12, Gary Kramlich
43aa3fab2883