merge the nul byte fix, port some markup to restructured text