Fix markup
Fix changelog format
Merge branch 'ruby-2-0' into ruby-2-0-pr

Conflicts:
	ChangeLog