squash

Signed-off-by: Samuel Just <sam.just@inktank.com>