Correct bad merge with master
Correct bad merge with master

diku-kmc/repg,diku-kmc/kleenexlang,diku-kmc/kleenexlang,diku-kmc/kleenexlang,diku-kmc/kleenexlang,diku-kmc/kleenexlang,diku-kmc/kleenexlang,diku-kmc/repg,diku-kmc/repg,diku-kmc/repg,diku-kmc/repg,diku-kmc/repg