Merge branch 'dont-crash-email-settings' into 'develop'