[B.A.T.M.A.N.] Merging of changes only in maint back to trunk