Fix typeMerge for scalar op vector types.
Merge pull request #1879 from ibuclaw/scalar_op_vector

Fix typeMerge for scalar op vector types.