Missing return value
Merge remote-tracking branch 'upstream/master' into RunQueryToDatabaseQuery_database
Linux compile fixes