Update BActiveForm.php
Merge origin/master