Commit Graph

438 Commits

Author SHA1 Message Date
whyisjake f83664c487 Bundled Themes: Add custom color pallettes for block editor.
Gutenberg 7.9 added support for themes to bundle their own custom styles in to the editor. These changes have been added to 2010 - 2016.

See #50120. 

Props kjellr, sabernhardt, ianbelanger. 


Built from https://develop.svn.wordpress.org/trunk@48459


git-svn-id: http://core.svn.wordpress.org/trunk@48228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-07-13 17:08:03 +00:00
Sergey Biryukov 953868b3a3 Bundled Themes: Use HTTPS for XHTML Friends Network URL.
Props raajtram, jrf, passoniate, bookdude13, sabernhardt, audrasjb.
See #48002.
Built from https://develop.svn.wordpress.org/trunk@48290


git-svn-id: http://core.svn.wordpress.org/trunk@48059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-07-03 23:42:01 +00:00
whyisjake 55b80358a5 Bundled Themes: Update latest version for `Tested up to:` in readme.txt file.
Fixes #50503.
Props mukesh27, hareesh-pillai.


Built from https://develop.svn.wordpress.org/trunk@48271


git-svn-id: http://core.svn.wordpress.org/trunk@48040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-07-01 22:06:05 +00:00
Sergey Biryukov 30e0cf9fcd Docs: Bundled Themes: Correct DocBlock placement for custom header and background argument filters.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48264


git-svn-id: http://core.svn.wordpress.org/trunk@48033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-07-01 13:52:01 +00:00
desrosj 4b60af1a6a General: Remove “whitelist” and “blacklist” in favor of more clear and inclusive language.
“The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.”

With this commit, all occurrences of “whitelist” and “blacklist” (with the single exception of the `$new_whitelist_options` global variable) are removed. A new ticket has been opened to explore renaming the `$new_whitelist_options` variable (#50434).

Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.

Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.

Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See #48900, #50434.
Fixes #50413.
Built from https://develop.svn.wordpress.org/trunk@48121


git-svn-id: http://core.svn.wordpress.org/trunk@47890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 17:26:13 +00:00
Sergey Biryukov e13c363b17 Docs: Capitalize "ID", when referring to a post ID, term ID, etc. in a more consistent way.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48104


git-svn-id: http://core.svn.wordpress.org/trunk@47873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:02:12 +00:00
Sergey Biryukov de59ad23a4 Docs: Consistently include an empty line between `@since` tag and `@see`, `@link`, or `@global`, per the documentation standards.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48067


git-svn-id: http://core.svn.wordpress.org/trunk@47834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-16 21:07:14 +00:00
Sergey Biryukov 7932193708 Coding Standards: Use strict comparison where static strings are involved.
This reduces the number of `WordPress.PHP.StrictComparisons.LooseComparison` issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@47808


git-svn-id: http://core.svn.wordpress.org/trunk@47584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-05-16 18:42:12 +00:00
Sergey Biryukov 38676936ba Coding Standards: Use strict type check for `in_array()` and `array_search()` where strings are involved.
This reduces the number of `WordPress.PHP.StrictInArray.MissingTrueStrict` issues from 486 to 50.

Includes minor code layout fixes for better readability.

See #49542.
Built from https://develop.svn.wordpress.org/trunk@47550


git-svn-id: http://core.svn.wordpress.org/trunk@47325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-05 03:02:11 +00:00
desrosj 64b3c852bf Bundled Themes: Bump version numbers and update changelogs in default themes for WordPress 5.4.
Props ianbelanger, desrosj, SergeyBiryukov.
Fixes #49743.
Built from https://develop.svn.wordpress.org/trunk@47539


git-svn-id: http://core.svn.wordpress.org/trunk@47314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-03-31 19:11:07 +00:00
ianbelanger 27a52dec3e Bundled Themes: Update calendar widget styles for 5.4 markup.
Fixes the alignment of month links in the calendar widget with the changes in version 5.4 for all Bundled Themes, except Twenty Thirteen, which was already fixed in #49546.

Props sabernhardt.
Fixes #49549.
Built from https://develop.svn.wordpress.org/trunk@47405


git-svn-id: http://core.svn.wordpress.org/trunk@47192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-03-02 16:55:08 +00:00
Sergey Biryukov 641c632b0c Coding Standards: Use Yoda conditions where appropriate.
See #49222.
Built from https://develop.svn.wordpress.org/trunk@47219


git-svn-id: http://core.svn.wordpress.org/trunk@47019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-02-09 16:55:09 +00:00
Sergey Biryukov 001ffe81fb Docs: Improve inline comments per the documentation standards.
Includes minor code layout fixes for better readability.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47122


git-svn-id: http://core.svn.wordpress.org/trunk@46922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-01-29 00:45:18 +00:00
Sergey Biryukov 3fe8bdfca7 Happy New Year!
Update copyright year to 2020 in bundled themes' `readme.txt`.
Built from https://develop.svn.wordpress.org/trunk@47026


git-svn-id: http://core.svn.wordpress.org/trunk@46826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-01-01 03:53:01 +00:00
Sergey Biryukov 7de0113520 Bundled Themes: Update copyright year in `readme.txt`.
Add a unit test to ensure the year stays up to date.

Props dkarfa, SergeyBiryukov.
Fixes #48566.
Built from https://develop.svn.wordpress.org/trunk@46719


git-svn-id: http://core.svn.wordpress.org/trunk@46519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-12 17:36:02 +00:00
desrosj 24f21d628d Bundled Themes: Standardize the Required PHP and Tested Up To headers.
This change makes several changes to ensure consistency and accuracy for default theme headers:

- Removes `WordPress` from `Requires at least` headers.
- Ensures the `Requires at least` and `Requires PHP` headers are present in every default theme’s `style.css` file.
- Ensures `Tested up to` is present in every `readme.txt` file.
- Removes any headers not processed in both the `style.css` and `readme.txt` files for each theme.

Props Otto42, afragen.
Fixes #48517.
Built from https://develop.svn.wordpress.org/trunk@46676


git-svn-id: http://core.svn.wordpress.org/trunk@46476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-07 15:19:04 +00:00
desrosj 09d8704f0f Ensure `svn:eol-style` is consistently set for all files (part 2).
Continuation of [46586]

See #42594.
Built from https://develop.svn.wordpress.org/trunk@46587


git-svn-id: http://core.svn.wordpress.org/trunk@46384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-25 19:29:04 +00:00
Sergey Biryukov bcd53396f1 Twenty Fourteen: Replace overly broad float-clearing selectors with more specific ones, to avoid unintentionally targeting elements generated by plugins.
Props ianbelanger, iandunn, karmatosed.
Fixes #35779.
Built from https://develop.svn.wordpress.org/trunk@46430


git-svn-id: http://core.svn.wordpress.org/trunk@46228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-08 02:02:03 +00:00
Sergey Biryukov d294597e6e Twenty Fourteen: Ensure the content after the Read More tag is visible and has the appropriate padding.
Props ianbelanger, sabernhardt, slobodanmanic, Quantumstate, Gwendydd, andraganescu, francina.
Fixes #28967.
Built from https://develop.svn.wordpress.org/trunk@46429


git-svn-id: http://core.svn.wordpress.org/trunk@46227 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-08 01:54:01 +00:00
Sergey Biryukov 42d52ce080 Bundled Themes: Declare HTML5 support for scripts and styles.
Fixes #42804.
Built from https://develop.svn.wordpress.org/trunk@46165


git-svn-id: http://core.svn.wordpress.org/trunk@45977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-18 14:51:56 +00:00
Sergey Biryukov e199663322 I18N: Capitalize translator comments consistently, add trailing punctuation.
Includes minor code layout fixes.

See #44360.
Built from https://develop.svn.wordpress.org/trunk@45932


git-svn-id: http://core.svn.wordpress.org/trunk@45743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-03 00:41:05 +00:00
Sergey Biryukov 83187125e4 Bundled Themes: Audit and update version numbers passed to `wp_enqueue_script()` to ensure proper cache busting.
Props dswebsme, ianbelanger, justinahinon.
Fixes #46981.
Built from https://develop.svn.wordpress.org/trunk@45768


git-svn-id: http://core.svn.wordpress.org/trunk@45579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-08-08 01:29:58 +00:00
Sergey Biryukov e0563013ed Bundled Themes: Audit and update version numbers passed to `wp_enqueue_style()` to ensure proper cache busting.
Props dswebsme, ianbelanger, desrosj.
Fixes #46979.
Built from https://develop.svn.wordpress.org/trunk@45767


git-svn-id: http://core.svn.wordpress.org/trunk@45578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-08-08 01:25:58 +00:00
Sergey Biryukov ac10f9b9e4 Bundled Themes: Replace Codex URLs with a corresponding HelpHub or DevHub article.
Props ianbelanger, tobifjellner, SergeyBiryukov.
See #47771.
Built from https://develop.svn.wordpress.org/trunk@45675


git-svn-id: http://core.svn.wordpress.org/trunk@45486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-07-25 22:46:55 +00:00
Gary Pendergast c71bc1513e Coding Standards: Add missing translator comments to the default themes.
All default themes now have translator comments for all strings with placeholders!

See #46732.

Built from https://develop.svn.wordpress.org/trunk@45609


git-svn-id: http://core.svn.wordpress.org/trunk@45420 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-07-09 01:10:00 +00:00
Gary Pendergast 0d23be600e Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in the default themes.
See #47632


Built from https://develop.svn.wordpress.org/trunk@45581


git-svn-id: http://core.svn.wordpress.org/trunk@45392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-07-01 08:23:57 +00:00
Felix Arntz 3c40573f77 Bundled Theme: Load Google fonts with `display=fallback` parameter for better UX in case the font cannot be loaded.
Providing this query parameter ensures the stylesheet contains the `font-display: fallback` rule. This changeset also updates the Open Sans font used by core accordingly.

Props westonruter.
Fixes #47282.

Built from https://develop.svn.wordpress.org/trunk@45485


git-svn-id: http://core.svn.wordpress.org/trunk@45296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-05-31 10:10:54 +00:00
laurelfulford 678e940ee7 Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.2.

The POT files for Twenty Eleven and Twenty Ten have also been updated.

Fixes #47172.


Built from https://develop.svn.wordpress.org/trunk@45289


git-svn-id: http://core.svn.wordpress.org/trunk@45098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-05-07 18:49:53 +00:00
Adam Silverstein 18ccaf962e Bundled Theme: add a `wp_body_open` shim for older WordPress versions.
WordPress 5.2 adds the `wp_body_open()` function, and the default themes make use of it. This patch adds a shim for `wp_body_open` to bundled themes so this function will also work in older versions of WordPress.

Props lgedeon, johnbillion, timph, ramiy, pento.
Fixes #46679.


Built from https://develop.svn.wordpress.org/trunk@45256


git-svn-id: http://core.svn.wordpress.org/trunk@45065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-23 13:04:56 +00:00
Sergey Biryukov 8fdb4c2b0c Bundled Themes: Update `readme.txt` files to pass Theme Review guidelines.
Props rabmalin.
Fixes #45871.
Built from https://develop.svn.wordpress.org/trunk@45250


git-svn-id: http://core.svn.wordpress.org/trunk@45059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-19 13:41:54 +00:00
desrosj 47ad9774e3 Bundled Themes: Reverts [45213].
Reverting to address backward compatibility concerns in Twenty Eleven and Twenty Ten.

See #39997.
Built from https://develop.svn.wordpress.org/trunk@45218


git-svn-id: http://core.svn.wordpress.org/trunk@45027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-16 18:22:52 +00:00
desrosj 464535d0d3 Bundled Themes: Use the theme version when enqueuing theme specific stylesheets.
For many bundled theme related stylesheets, a version is either not specified, or specified as a hardcoded date string when enqueued. This is problematic when a stylesheet is updated and the version number is not (which has happened several times recently). This change ensures that all bundled theme related stylesheets use the theme’s version as the stylesheet version. This ensures cache busting for theme stylesheets every time a theme is updated and guarantees that users receive any new or updated styles included in the update when visiting the site for the first time after an update.

Props parsmizban, ianbelanger, dswebsme.
Fixes #39997.
Built from https://develop.svn.wordpress.org/trunk@45213


git-svn-id: http://core.svn.wordpress.org/trunk@45022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-16 14:56:51 +00:00
Sergey Biryukov 37f04694d5 Bundled Themes: Use consistent HTML comments after closing HTML tags.
Props iamdmitrymayorov.
Fixes #46871.
Built from https://develop.svn.wordpress.org/trunk@45209


git-svn-id: http://core.svn.wordpress.org/trunk@45018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-16 01:30:53 +00:00
Sergey Biryukov 76e6cc67c2 Bundled Themes: Link to an updated documentation on child themes on developer.wordpress.org, instead of Codex.
Props man4toman, andraganescu.
Fixes #46450.
Built from https://develop.svn.wordpress.org/trunk@45081


git-svn-id: http://core.svn.wordpress.org/trunk@44890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-01 11:56:52 +00:00
Adam Silverstein 418afaa938 Bundled Theme: trigger a new `wp_body_open` action immediately after the opening `body` tag.
* Enables inserting (asynchronous) JavaScript right after the opening `body` tag.
* Add a `wp_body_open` helper function that triggers the `wp_body_open` action.
* Call `wp_body_open` in core themes immediately after the opening `body` tag.

Props joostdevalk, valendesigns, nacin, saracup, jorbin, mikeschinkel, jonnybojangles, lgedeon, Willscrlt, Denis-de-Bernardy, lexiqueen, sky_76, welcher, westonruter, ramiy, joyously.
Fixes #12563.

Built from https://develop.svn.wordpress.org/trunk@45042


git-svn-id: http://core.svn.wordpress.org/trunk@44851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-27 21:59:52 +00:00
laurelfulford a1eceec5bd Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.1.

The POT files for Twenty Eleven and Twenty Ten have also been updated.

Fixes #46070.


Built from https://develop.svn.wordpress.org/trunk@44730


git-svn-id: http://core.svn.wordpress.org/trunk@44561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-02-07 23:23:50 +00:00
Gary Pendergast 7a617078fa Coding Standards: Upgrade WPCS to 1.2.1.
This upgrade fixes quite a few false positives, as well as auto-fixing some indenting issues.

Fixes #45956.


Built from https://develop.svn.wordpress.org/trunk@44574


git-svn-id: http://core.svn.wordpress.org/trunk@44405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-12 06:41:52 +00:00
Gary Pendergast 4f861b9548 Coding Standards: Fix the `Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace` violations.
See #45934.


Built from https://develop.svn.wordpress.org/trunk@44566


git-svn-id: http://core.svn.wordpress.org/trunk@44397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-11 06:40:50 +00:00
Gary Pendergast be127956e0 Bundled Themes: Run the `pingback_url` through `esc_url()`.
Twenties Ten through Seventeen have been updated to properly escape the pingback URL. Twenty Nineteen is already escaping the URL.

Props soulseekah, sharaz.
Fixes #43717.


Built from https://develop.svn.wordpress.org/trunk@44500


git-svn-id: http://core.svn.wordpress.org/trunk@44331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-09 06:11:51 +00:00
Gary Pendergast a583725622 Docs: Update Codex references to the `Template_Hierarchy` page.
https://codex.wordpress.org/Template_Hierarchy redirects to https://developer.wordpress.org/themes/basics/template-hierarchy/, so we should link to the correct page.

Props kmeze, pento.
Fixes #45222.


Built from https://develop.svn.wordpress.org/trunk@44496


git-svn-id: http://core.svn.wordpress.org/trunk@44327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-09 05:09:51 +00:00
Sergey Biryukov 8917b0e89f Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.0.3.

The POT file for Twenty Eleven has also been updated.

Props laurelfulford.
Fixes #45792.
Built from https://develop.svn.wordpress.org/trunk@44435


git-svn-id: http://core.svn.wordpress.org/trunk@44266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 18:58:50 +00:00
laurelfulford dfeda2fb94 Bundled Themes: Bump script and style version numbers.
When existing scripts or styles are updated in default themes, the version numbers in the enqueues should also be bumped to make sure the old files don't cache. This update bumps version numbers for changes since version 5.0, for themes Twenty Eleven through Twenty Nineteen. 

Fixes #45679.


Built from https://develop.svn.wordpress.org/trunk@44382


git-svn-id: http://core.svn.wordpress.org/trunk@44212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 18:04:50 +00:00
laurelfulford 30c7257aad Bundled Themes: Make sure button blocks respect settings.
When the original block editor styles were added to the existing default themes, the button blocks were styled to match how each theme styled the `button` tag. 

However, the styles should respect the block editor's default style, "Rounded", and allow switching to the other styles, like "Outlined" and "Square".

Fixes #45541.


Built from https://develop.svn.wordpress.org/trunk@44381


git-svn-id: http://core.svn.wordpress.org/trunk@44211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 03:53:53 +00:00
laurelfulford 1d2efe8fa7 Twenty Fourteen: Correct video play button position.
A change to the MediaElement.js caused Twenty Fourteen's custom video play button to display in the top corner, rather than centered. This update returns it to its correct position. 

Props mmaumio, celloexpressions.
Fixes #44664.


Built from https://develop.svn.wordpress.org/trunk@44380


git-svn-id: http://core.svn.wordpress.org/trunk@44210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 01:47:51 +00:00
laurelfulford 7b44d484ea Twenty Fourteen: Remove text decoration from button block.
The button block in Twenty Fourteen was incorrectly inheriting a text underline from the theme's link styles.

Props bobbingwide.
Fixes #45732.


Built from https://develop.svn.wordpress.org/trunk@44378


git-svn-id: http://core.svn.wordpress.org/trunk@44208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-01 17:40:54 +00:00
laurelfulford fc094984ea Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.0.2.

The POT files for Twenty Ten and Twenty Eleven have also been updated.

Fixes #45681.


Built from https://develop.svn.wordpress.org/trunk@44322


git-svn-id: http://core.svn.wordpress.org/trunk@44152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-19 03:38:04 +00:00
desrosj 4aa38f2193 Bundled Themes: Replace “Gutenberg” in code comments and classes.
This update replaces the term “Gutenberg” in the themes code comments and classes with something more future-friendly.

Props laurelfulford.

Merges [44213] into trunk.

Fixes #45452.
Built from https://develop.svn.wordpress.org/trunk@44313


git-svn-id: http://core.svn.wordpress.org/trunk@44143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-19 03:30:41 +00:00
desrosj 6ab27f50a6 Bundled Themes: Update default block appender selector.
The markup for the default block appender changed from a text input to a text area in the editor; this update makes the same change in the default theme styles.

Props laurelfulford.

Merges [44212] into trunk.

Fixes #45450.
Built from https://develop.svn.wordpress.org/trunk@44312


git-svn-id: http://core.svn.wordpress.org/trunk@44142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-19 03:29:51 +00:00
desrosj 608eb55335 Bundled Themes: Fix button block custom colors on front end.
Simplify some of the button block’s CSS selectors in the theme, to make sure the default colors don’t override the custom colors on the front end.

This fix is applied to Twenty Sixteen, Twenty Fifteen and Twenty Fourteen. 

Props laurelfulford.

Merges [44197-44198] and [44200] into trunk.

Fixes #45428, #45429.
Built from https://develop.svn.wordpress.org/trunk@44306


git-svn-id: http://core.svn.wordpress.org/trunk@44136 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-19 03:24:59 +00:00
desrosj a9b6d58870 Default Themes: Bump the version numbers and release dates.
The POT files for Twenty Ten and Eleven have also been updated.

Props laurelfulford, maedahbatool, mrahmadawais, pento.

Merges [43964] into trunk.

Fixes #45167.
Built from https://develop.svn.wordpress.org/trunk@44279


git-svn-id: http://core.svn.wordpress.org/trunk@44109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-17 19:38:53 +00:00