Merge "Addressing problems with jquery.badge mentioned at I0f5e7541"