Merge "Reposition nested FancyCaptcha, conditional help."