Modified form to take into account the various changes implemented by previous commits.
Modified form to take into account the various changes implemented by previous commits.

ekylibre/ekylibre,ekylibre/ekylibre,ekylibre/ekylibre,ekylibre/ekylibre,ekylibre/ekylibre