Pulled updates to orgmode-mediawiki
php-mode