Final 6th ed release

synching my fork with master