Issue #23: Update to version 3.6.