fix bad return value from function
Merge branch 'diffbot' into testing
updates