Merge branch 'master' of https://github.com/VikingOrg/viking.git
Merge branch 'master' of https://github.com/VikingOrg/viking.git
user update fix.