Merge branch 'hotfix/20140523-pagoda'
LoV
up-stage
Merge branch 'hotfix/20140523-lov' into develop