fix primitive
Merge branch 'fixMixedInt20140701'