Fixed slices, again.
Merge origin/master