TriggerTool-04-02-06

William Panduro Vazquez

@jpanduro

ee1c9289 · Migrate remaining SVN fixes. · Oct 20, 2017

Multiple fixes, includes remaining SVN patches.