Merge "(bug 39383, bug 40059) Allowing badges to use strings and returning this"