Removing trailing whitespace after closing PHP tag

Otherwise it causes "headers already sent" warnings
Merge remote-tracking branch 'origin/bp_not_required' into bp_not_required