Merge https://gist.github.com/6617248 into shiva-persist-ebean
Putting the original gist files in their correct places