nicotalk
Merge branch 'hotfix/20141008-nicotalk'