Merge proposals dependent on lp://qastaging/~openerp-community/openobject-doc/stefan-therp_document_ftp_configuration

1. stefan-therp_document_ftp_configuration
2. Dependent merge proposals