Fix upgrade problem from 5.5.x to 5.6.x
Merge pull request #1822 from hissy/upgrade

Fix upgrade problem from 5.5.x to 5.6.x