fix to assoc docs + new multiassoc definition
Merge branch 'master' into pr/262