Import changes from vGolf Deluxe development.