[MERGE] Merged branch holding addons-30 misc improvements. FP-style merge for testing purpose.
[MERGE] Merged branch holding addons-30 misc improvements. FP-style merge for testing purpose.
MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server