Rename be-nl to nl-be (this must have got lost in a conflict resolution somewhere)
Merge branch 'develop' into l10n_suffix