GCC 4.7+ fixes

Signed-off-by: kecinzer <kecinzer@gmail.com>
Merge branch 'jb-mr1' into sm
Merge branch 'sm' into sm-4.3