Merge remote-tracking branch 'origin/DEV20141212' into estimate-sharing-improvements

* origin/DEV20141212:
Merge remote-tracking branch 'origin/estimate-sharing-improvements' into DEV20141212

* origin/estimate-sharing-improvements: