Upgrading AspectJ
It's username, not user id since a while
Merge branch '1_2_X'