2.0 stable

I am not sure if i grouped this correctly, but my topic-branch would only compare to master and that does not seem appropriate.
The change to the Gemfile was necessary to be able to bundle 2.0_stable, the rest is just a few TestCases to motivate the backport.