Updates to Sweepster to get it working again.
Merge next-stable branch to default.