Merge proposals dependent on lp://staging/~openerp-dev/openobject-addons/trunk-bug-1185457-amitvora

1. trunk-bug-1185457-amitvora
2. Dependent merge proposals