V1.4

bug 981764

* Resolved merge conflicts.