Merge branch 'master', remote-tracking branch 'origin/master'
compiling top level aes_core with encryption/decrytpion