association rest fails with 404
Merge remote-tracking branch 'origin/master'