dixq
Merge branch 'hotfix/20141217-dixq'