Merge in changes from the AOEMedia fork