Merge pull request #1602 from Spuds/fii

A few more RC1 prep fixes
! extra spaces

Signed-off-by: Spuds <spuds@spudsdesign.com>
! remove extra newlines at end of file

Signed-off-by: Spuds <spuds@spudsdesign.com>
! add missing docblock params

Signed-off-by: Spuds <spuds@spudsdesign.com>