Fix/try a stable merge

this PR is there to show what a stable-to-dev merge brings.

Let's see what travis thinks of it.