[MERGE] merged the branch that fixes lp:919932 (duplicated account type for dutch...