Merge proposals dependent on lp://staging/~alejandrosantana/ocb-addons/6.1-ocb-addons-fix-bug-1089229

1. 6.1-ocb-addons-fix-bug-1089229
2. Dependent merge proposals