hack to get idm working
Merge branch 'shane-picketlink' into picketlink