Bring ljm42:master up to date