Cleaned up a bit.
Merge branch 'v0.35'

Conflicts:
	nn_quadratic.c
Merge branch 'v0.35'
Merge branch 'v0.35'
Merge branch 'v0.35'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'
Merge branch 'v0.36'