Another merge with master.

Updated Doxygen error numbers yet again, as Python errors got added in the
meanwhile, pushing the Doxygen ones further off.

And re-merged PEP8/whitespace-related conflicts in autodoc_runme.py once again
(if anybody is looking for a motivating example about why significant
whitespace is bad, here is a great use case).

Examples/php/callback/example.i

@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;