Merge branch 'issue-379' of https://github.com/x-team/wp-stream into issue-379

Conflicts:
includes/db-updates.php
Weird conflict.