Merge remote branch 'aaronw/bug608_checkbox_labels'