Merge branch 'bug_592_dont_allow_default_parental_control_pin' into experimental