Merge branch 'hotfix/20141211-block02'
uuu9
Merge branch 'hotfix/20141211-block03' into develop