upload 2014-03-04

combine fix for dumptriggers