Merge fix from Peter Fu, avaje-ebeanorm/pull/9 request plus associated
test