Make sure output parameters are restored correctly
Merge branch 'master' of github.com:hananils/association_output