Minor bug fix
Merge branch 'Upstream/master'