Plugins: Custom datasource example adapted to return timestamps in millieseconds, Fixes #1263
Merge remote-tracking branch 'upstream/master'