Merge branch 'master' into next

diff --cc wcfsetup/install/files/js/WCF.User.js
index 262adb9b00015a334822a5ef992815f367766876,986ab3ee0f58ea5f86773a57e36e2043401a745c..ea96f1dacea713832d424204d1e2274495913649
--- 1/wcfsetup/install/files/js/WCF.User.js
--- 2/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@@ -2119,10 -2320,12 +2119,12 @@@ WCF.User.Action.Follow = Class.extend(
                                
                                // toogle icon title
                                if (data.returnValues.following) {
 -                                      button.data('tooltip', WCF.Language.get('wcf.user.button.unfollow')).children('.icon').removeClass('icon-plus').addClass('icon-minus');
 +                                      button.attr('data-tooltip', WCF.Language.get('wcf.user.button.unfollow')).children('.icon').removeClass('fa-plus').addClass('fa-minus');
+                                       button.children('.invisible').text(WCF.Language.get('wcf.user.button.unfollow'));
                                }
                                else {
 -                                      button.data('tooltip', WCF.Language.get('wcf.user.button.follow')).children('.icon').removeClass('icon-minus').addClass('icon-plus');
 +                                      button.attr('data-tooltip', WCF.Language.get('wcf.user.button.follow')).children('.icon').removeClass('fa-minus').addClass('fa-plus');
+                                       button.children('.invisible').text(WCF.Language.get('wcf.user.button.follow'));
                                }
                                
                                button.data('following', data.returnValues.following);
@@@ -2226,10 -2435,12 +2228,12 @@@ WCF.User.Action.Ignore = Class.extend(
                                
                                // toogle icon title
                                if (data.returnValues.isIgnoredUser) {
 -                                      button.data('tooltip', WCF.Language.get('wcf.user.button.unignore')).children('.icon').removeClass('icon-ban-circle').addClass('icon-circle-blank');
 +                                      button.attr('data-tooltip', WCF.Language.get('wcf.user.button.unignore')).children('.icon').removeClass('fa-ban').addClass('fa-circle-o');
+                                       button.children('.invisible').text(WCF.Language.get('wcf.user.button.unignore'));
                                }
                                else {
 -                                      button.data('tooltip', WCF.Language.get('wcf.user.button.ignore')).children('.icon').removeClass('icon-circle-blank').addClass('icon-ban-circle');
 +                                      button.attr('data-tooltip', WCF.Language.get('wcf.user.button.ignore')).children('.icon').removeClass('fa-circle-o').addClass('fa-ban');
+                                       button.children('.invisible').text(WCF.Language.get('wcf.user.button.ignore'));
                                }
                                
                                button.data('ignored', data.returnValues.isIgnoredUser);