merging odeint from trunk
applied typo patch for odeint
merging docs changes from odeint in release branch