Internal update.
Merge branch 'trunk' of https://github.com/demonofshadow/ASAV into james