fix bug http://199.230.109.18:8086/redmine/issues/114
Merge remote-tracking branch 'origin/diffProcess' into diffProcess