Merge remote-tracking branch 'origin/develop' into issue-267

Conflicts:
includes/admin.php
includes/feeds.php
includes/list-table.php