Update Zend_Locale_Format to the latest Zend version
Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+
Update i18n.md

Corrected a mistake: to make a new locale available (in particular for use with silverstripe/translatable), i18n:common_locales needs to be updated, not i18n:common_languages.
Merge pull request #3158 from JorisDebonnet/patch-1

Update i18n.md
Merge pull request #3155 from simonwelsh/iconv_changes

Only use iconv.internal_encoding in PHP<5.6
Update simple-contact-form.md

corrects the description about the order of the arguments passed while creating Form object.
Merge pull request #3160 from sanjaymundhra/patch-8

Update simple-contact-form.md
Update sqlquery.md

adds missing datatype (i.e. Varchar) to the database field 'Name' of the Class 'Player'
Update DropdownField.php

An error in the example (missing comma) spotted by michaelcslweb
Merge pull request #3166 from phillprice/patch-2

Update DropdownField.php
Merge pull request #3165 from sanjaymundhra/patch-9

Update sqlquery.md
Merge pull request #1 from silverstripe/3.1

So let's just accept this then, since this is my branch. I'm sure I'll figure it out it one day!