Tickets #3319 and #3386. Doc commits for version history.