Merged TALOS-CAN-0128
release-2.x.y
2016-06-12, Gary Kramlich