Fixing merge error.
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #839 from andrerod/dev

Fix merge error