Merge remote-tracking branch 'upstream/master'
completed AssociateUsagePoint bug fix
Merge pull request #86 from jateeter/master

completed AssociateUsagePoint bug fix