Updated deprecated code references
Merge remote-tracking branch 'upstream/master'

Signed-off-by: Robert Weber <closingtag@gmail.com>

Conflicts:
	pi.simplepie.php