Fix TALOS-CAN-0139
release-2.x.y
2016-06-03, Andrew Victor