[Bugs][Fixed] 20140527
Merge branch 'hotfix-v2.1.2'