Merge branch 'checkboxes-and-radios'