k7 update
Merge branch 'master' of https://github.com/vhdluj/ATLAS
master commit