update for 1.6.4 (FML769)
Merge branch 'develop'