AIM does not require IC2, silly buildfile!
Merge branch 'master' into 1.6.2-working