usxxxx - idp updates
Merge branch '2014.2-usxxx-idp-updates'
Merge branch 'release'