Intern 1.6 Update
Merge pull request #869 from vladikoff/in16

Intern 1.6 Update