Merge branch 'shane-picketlink' into picketlink