Add third parameter to preg_match_all
Merge pull request #1161 from scotchfield/preg_match_all_fix

Add third parameter to preg_match_all
add waffle.io badge
Merge pull request #1162 from waffle-iron/master

waffle.io Badge
Tiled Gallery: Fix square/circle display bug.

Square and circle galleries were not displayed properly. Fixed layout
computation.
Merge pull request #1163 from Automattic/fix/tiled-gallery-display-bug

Tiled Gallery: Fix square/circle display bug.
Contact Form: Add filter to allow more than 5 new fields
Merge pull request #1165 from kraftbj/contact-form-increase

Contact Form: Add filter to allow more than 5 new fields
Tile Gallery: Adding Columns attribute to the shortcode

Currently on WordPress.com we had columns document as an attribute for
the gallery shortcake but we don’t have it implemented.
Tile Gallery: Remove impress use photon instead

Circle and Squere gray images were generated via imgpress instead of
photon.
Tile Gallery: Removing commented out code
Resolve divergence from Jetpack - Big Whitespace Fix.

Also some minor code style things, adding braces, etc.  But mostly
converting line indentations from spaces to tabs, most of which have
crept in via pull requests.
https://github.com/Automattic/jetpack/commit/e4c9584e67f1cb4027590600624e67a6371ce85f

Merges r106400-wpcom.
Resolve divergence from Jetpack - Big Whitespace Fix.

Also some minor code style things, adding braces, etc.  But mostly
converting line indentations from spaces to tabs, most of which have
crept in via pull requests.
https://github.com/Automattic/jetpack/commit/e4c9584e67f1cb4027590600624e67a6371ce85f

Merges r106400-wpcom.
Merge commit '89ac169'
Minor styles change when merging .com code
Conflicts:
	modules/widget-visibility/widget-conditions.php
Scribd Shortcode: Apparently they support HTTPS now for their embeds, so let's use protocol-agnostic links to go either way. See https://[private link]

Merges r106443-wpcom.
Scribd Embeds: HTTPS Support
Since Scribd is a core-provided oembed provider, and we're now processing oembed in comments as well, that's kicking in to handle one-line embeds in that context. This filter overrides the oembed endpoint provided by core so that it hits the HTTPS endpoint, and thus gets back HTTPS embed data. See https://[private link]

Merges r106445-wpcom.
Widget Conditions: File formating