pagoda56
Merge branch 'hotfix/20140523-pagoda'