20141112 merge master
[boshiamy] Adjust some char type definitions
Merge branch 'boshiamy_im' into develop