Merge branch 'hotfix/20141002-kmsk'
nicotalk
Merge branch 'hotfix/20141008-nicotalk' into develop