3.0
3.0
3.0
3.0.1
3.0.2
3.0.3
3.1.0
3.1.0
3.1.1
3.1.2
3.1.2
3.1.3
3.1.4
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Xml/XmlHelper.cs