Merged changes from 1.6.5 to 1.6.6

Don't merge until QA is complete!