Preparing version -15 to include the changes requested by Rob.