merge r30849 from trunk to branch 2.7 (branch 2.6 will no longer be updated): Add nb_NO, thanks to paulen