[IMP] fix e265
Merge remote-tracking branch 'upstream/6.1' into 6.1_fix_e265

Conflicts:
	web_ckeditor4/__openerp__.py
[FIX] trailing whitespace
Merge pull request #21 from hbrunn/6.1_fix_e265

[IMP] fix e265