Fix/Match
Changes for me/_tmo fix
From Arco
from arco
from arco
from arco
from arco
Revert "From Arco"

This reverts commit a584aa9e6f4ab5d2ba5d1768e0a43c57ea9c8e76.
really github...again....
Merge pull request #1 from doadin/jb2.6

bring up to date with 2.6 in prep for 3.0 changes