Merge branch 'hotfix/20141204-blocks-fix'
重複修正
Merge branch 'hotfix/20141204-blocks-fix2' into develop