Merge branch '0.2.28' into tizen_2.1