NEWSPLT-Rebase to JASIG master