Fixes for minor errors found while doing phpdoc comments
Authored by: lbayuk 2015-03-20
Parent: [r1675]
Child: [r1677]