j_spring_security_check fix
Merge remote-tracking branch 'origin/master'