Oh, I should mention the second commit branch I posted is squashed to have the database stuff in it as well so you would only need the second patch / branch I posted.
Oh, I should mention the second commit branch I posted is squashed to have the database stuff in it as well so you would only need the second patch / branch I posted.