Merge remote-tracking branch 'origin/master' into issue-65

Conflicts:
includes/admin.php
includes/list-table.php
includes/query.php
includes/settings.php
languages/stream-pl_PL.mo
languages/stream-pl_PL.po
readme.md
readme.txt