Fixed merge issue
Merge pull request #1591 from Benglin/master

Fixed auto-merge issue