Fix issues with strange A2 install and A2 free
Merge remote-tracking branch 'upstream/master'
Merge pull request #1100 from icomrade/master

Fix issues with strange A2 install and A2 free