- By Benjamin. Fixed bug 3104 and 3105.
Merge branch 'master' of https://github.com/huahengling/HLA-New-Design