Updates for AUX 3.7
Merge pull request #1463 from tamram/061213

Updates for AUX 3.7