I highly recommend the oacs-5-2 branch. Obviously all bug fixes will only make it to the branch and not to the tarball until a new release is cut.