Extension:MobileFrontend/Deployments/2013-08-20

Stories
Story 986: Log watchlist interactions

Story 920: Force upload CTA on beta

Story 921: Adding editing tutorial

Bugs
Bug 50952: Show a link on talk page back to subject page

Bug 51977: Hide the talk icon when refreshing talk pages

Bug 52511: Make editor load correct page for ajax loaded pages

Bug 52361: Fix reference weirdness in Opera Mobile

Bug 53059: Clarify editing message when unavailable

Bug 52515: Correct reply message

Bug: 22660 Display the categories on the mobile site

Bug 51924: Special case main page history link

Bug 52207: Support reCaptcha

Bug 52856: Fix the thank button

Regression: slightly wrong styling in uploads nag overlay

Bug 51647: Allow right clicking on nearby

Bug 51697: Support all types of talk

Bug: 49948 List Special:Nearby on Special:SpecialPages

Regression
Regression: slightly wrong styling in uploads nag overlay

Hygiene
Hygiene: Drop mf- prefix from less files

Hygiene: Use HTTPS links rather than HTTP ones in comments

Hygiene: Start enforcing modules

Hygiene: Rewrite notification.js

Hygiene: Rewrite references

Hygiene: Make PhotoUploadProgress a Drawer

Uncategorized
Localization changes

Fix tap event fallback

Don't render categories on special pages if none

Alpha talk: Stop blank replying

Render the lists of categories as a normal subheading

Improve styling of buttons

Allow showing of other users uploads

Change settings page heading

Make tapping more responsive

Remove echo specific css

Removing related link hatnotes from preview output

Replace article with generic wording for content pages

Adding new lastmodified param to MobileView API

Don't pollute global scope

Enforce consistent closure format

Rm old hack that disables site and user JS

Fixing incorrect API param in M.history.retrievePage

Kill use of MobileFormatter on special pages

Make Nearby listed on Special:SpecialPages

Send proper X-Vary-Options

Make left nav menu slightly wider

Show last line of text in editor when guider is present

Simplify opt-in cookies

QA
change content_0 element to content to fix automation tests

Git Logs
commit 4e5bdf010945564b0b7aa12e277e4249ef7924e8 Author: jrobson  Date:  Thu Aug 15 14:29:51 2013 -0700

Bug 50952: Show a link on talk page back to subject page Change-Id: I9c2dc94504ef0ed22cf62cdffe59192683ce3302

commit 239c7766344d9f4baa8b358fec3064ab39827d2c Author: jrobson  Date:  Wed Aug 14 15:57:41 2013 -0700

Bug 51977: Hide the talk icon when refreshing talk pages Change-Id: Ie97266dd6c5ad49b1a10cd2424e16c1960864792

commit cbdc9e750559b9bd5bad115af5f6cbc835cf5b53 Author: jrobson  Date:  Fri Aug 16 13:09:40 2013 -0700

Hygiene: Drop mf- prefix from less files Change-Id: Ic4d57de95a7b61b3c31bfbcbdccf5c9804aa3f2e

commit 714065412c04420cc111cb9dc67b20ace98b6046 Author: jrobson  Date:  Fri Aug 9 12:20:57 2013 +0800

Bug 52511: Make editor load correct page for ajax loaded pages Change-Id: Ib65eb968172dc6eef7fc62a2a2c54e2c9fc24009

commit 5b066274f81def42a45a0c7696c3c269e8673fb9 Author: Translation updater bot  Date:  Mon Aug 19 19:32:54 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I7d8529d38146e78033b94f6bdbf5ca9c63c60818

commit 9c366ffc0908c133ebed69a48796d0a11574f1e6 Author: jrobson  Date:  Mon Aug 19 11:33:24 2013 -0700

Bug 52361: Fix reference weirdness in Opera Mobile I'd love to know why this fixes the problem... but I don't.   Yet it does. <3 JavaScript quirks Change-Id: Idce415b321bf7a9c4c4cab023d9eaeb884b3a583

commit 817cbb9335c1a7e947fb13f1b9940fb4753e44b1 Author: jrobson  Date:  Mon Aug 19 11:26:05 2013 -0700

Bug 53059: Clarify editing message when unavailable Distinguish between not allowed and not able to edit Change-Id: If750d0c03f3822e5387915cc69033172f960ffd2

commit 82b3816f10af4dc0a91f075f1b323cbda917c65e Author: Juliusz Gonera  Date:  Mon Aug 19 18:41:47 2013 +0200

Fix tap event fallback Previously the click event callback was called before mouseup which led to JS errors. Change-Id: I3c31199fb1d7d3a5eec26efd20aca4551700d63a

commit abcfda92770e4a97cd047bf3815040a16cd48b0b Author: jrobson  Date:  Mon Aug 19 09:44:04 2013 -0700

Don't render categories on special pages or if none Categories was showing up on login page Change-Id: I98ec87ca9560f1af75effdd17e9ebad782cc83cc

commit 379a70a262b6b3403a968d55c867e0475de976e5 Author: Translation updater bot  Date:  Sun Aug 18 19:37:01 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Iab581020b172499581cc98dbb5f21d470678a8bd

commit 0882aae0e534725432a1b7f8ade074d2ec1737a3 Author: Translation updater bot  Date:  Sat Aug 17 19:22:56 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Iac7d52dad8a81d374d76f92e58b0892ed4348ea5

commit 1add0ff63c4c0e1c69a7547d2b0fdd30a2b2a403 Author: Max Semenik  Date:  Sun Aug 4 04:07:31 2013 +0400

Hygiene: Use HTTPS links rather than HTTP ones in comments Change-Id: Ica0958ebf35a82d6d0d32b3ab74afcc815ea1530

commit 428f529bc03a6b787cf606a4c28a1c2b6a3acb66 Author: jrobson  Date:  Fri Aug 9 12:51:43 2013 +0800

Bug 52515: Correct reply message Change-Id: I3964a032cc2609d97eae0d416e95ee1a2db37948

commit 834a7983582bd8b29d963002d9fa3de8b4a06f4d Author: jrobson  Date:  Fri Aug 9 12:49:34 2013 +0800

Alpha talk: Stop blank replying Ensure that some text needs to be entered Change-Id: I1586f0567889b41194f6509df22e329c62d2eb94

commit 734725deb1317957f213eb2d937e9915fa76a594 Author: Translation updater bot  Date:  Fri Aug 16 19:20:48 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I57340a515e142eb2b07a7d5569e0ba0306d9e368

commit e504e7d05fe344c3df52aa688610dbc04aced397 Author: Linas Valiukas  Date:  Wed Aug 7 13:07:41 2013 +0800

Render the list of categories as a normal subheading for logged in mobile users. Depends on Change-Id I09679ac8515768a34c1ee436dfd32a50c9a89011 on mediawiki/core Bug: 22660 Change-Id: I13afda7037082cc0aab98f69d37b296b18edc1aa

commit 8645351864669a442f0a0d7f42ec6944883a0152 Author: jrobson <jrobson@wikimedia.org> Date:  Thu Jul 25 13:06:37 2013 -0700

Story 986: Log watchlist interactions Log various things around watchlist and diff view activity See: https://gerrit.wikimedia.org/r/76026 Change-Id: Ifd8b173c1851a01d61464547ffa382dfd15555b9

commit 06acfe90a070eb8f84fbb6c129dff15d05ae7953 Author: jrobson <jrobson@wikimedia.org> Date:  Thu Aug 15 14:15:56 2013 -0700

Bug 51924: Special case main page history link Change-Id: Ie223558ba9078424b2406f667639c3fc7b5077f2

commit 9572ac8f512864cfeff3e28c6688b901d3e116d4 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Thu Aug 15 19:37:40 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I4b319b01242dc12efed222c51969732e685d670e

commit fa2057240d3217f613552000d6371bf926f70b18 Author: jrobson <jrobson@wikimedia.org> Date:  Wed Aug 14 14:48:43 2013 -0700

Story 920: Force upload CTA on beta Thus force the blue help screen and help us experiment more with getting to a stage where people can login via the upload CTA and not upload selfies. (As requested by Maryana) Change-Id: I17bc8673bd3612e4c76bdf3d9c857cc315cdc84d

commit 09439ca6082f91b7c3f1cbae1235c5218f3bd468 Author: jrobson <jrobson@wikimedia.org> Date:  Wed Aug 14 21:10:21 2013 +0900

Improving styling of button on following pages: * Special:MovePage?target=San%20Francisco * Special:Import * Special:NewPages * Special:RecentChanges * Special:Prefixindex * Special:Contributions * Special:ChangePassword * Special:ChangeEmail * Special:Allpages Change-Id: I01eeab6df72b59b2a953d585c7e45d4dcbb210d7

commit e3bd0ea16fe8781f0ebb0c5a839afd99f6402cbb Author: jrobson <jrobson@wikimedia.org> Date:  Wed Aug 14 21:03:50 2013 +0900

Allow showing of other users uploads Going to Special:Uploads/XYZ will now show user XYZ's uploads Change-Id: Iee733bf866f9495ba32780247ce067199ec8221e

commit 7d1b4923267d8b1b1dbe87e9822104932da164a6 Author: kaldari <kaldari@gmail.com> Date:  Wed Jul 24 11:12:28 2013 -0700

Story 921: Adding editing tutorial Change-Id: Ic5ff437d5c219a87e0a8820c35ac987806048910

commit 2470112cd30bb69937a0c21135fcc91a43073b87 Author: jrobson <jrobson@wikimedia.org> Date:  Fri Jul 19 16:22:16 2013 -0700

Hygiene: Start enforcing modules This will make leakage from beta/alpha to stable more obvious Change-Id: I7bf02628dd256cd6e30eecf9bf91ba08cc5fd22a

commit d76cdb9e270a2d11f990e444a0df061bbea47dd9 Author: jrobson <jrobson@wikimedia.org> Date:  Wed Aug 14 14:53:51 2013 -0700

Bug 52207: Support reCaptcha Show cruft instead of empty string Change-Id: Ibae3ba6495969df17c388dbab88cbd5c401c035e

commit 271d19f72fe815c383e95c3602f2971c6574d565 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Wed Aug 14 19:25:50 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I585d175f53212ad1d118caf9ef958de468b88d00

commit c9041272f332c64932a56ff510d9d5233b5f2de4 Author: jrobson <jrobson@wikimedia.org> Date:  Thu Aug 15 00:33:54 2013 +0900

Bug 52856: Fix the thank button Doesn't pass the revision. Doh. Change-Id: I04061da6ffee7268d5fc07596256d79c24c4e74d

commit 9e9eb809441df66ba4c5c9a9f36798f809dd5463 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Tue Aug 13 19:27:56 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I77c6cfbe71abef75b330d5f6cfbf3c5408e7feff

commit 0ee5d2fbc4dc2390f7211366720791750f5676e8 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Mon Aug 12 19:20:49 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Iaf709da95ba7e2e04194f46fc6a02aaf2f77125b

commit 2ed3c9c29ef310c0f1210faaad67e5864d3c5ffa Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Sun Aug 11 19:42:09 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Ic3bc0116457b2ec4247a26ffe1e201a0f3449d18

commit 90c899dcabd7b0957fa69ec4ebff64243f84dbfb Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sun Aug 11 14:52:45 2013 +0800

Change settings page heading "Mobile site settings" is way too long and verbose. It leads to   horrendous translations in other languages (spanning across 2 or 3    lines). Settings is the name of the option in the menu and the heading should be consistent. Everyone browsing the mobile site knows that when they open settings, it's mobile site settings. Change-Id: If43725f4311968c778309220d4581cd8a14f7fc9

commit 987e07c41b7f54630c552e844e1cd472f71d20da Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Fri Jul 26 17:50:56 2013 -0700

Regression: slightly wrong styling in uploads nag overlay List elements there should have no bullet points. Change-Id: Ib9b26d3829b8766a071d3e27c89516c9e2f51d5a

commit e0c06c835b901be2d6ef9d09b732bf465db8573d Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sun Aug 11 13:31:04 2013 +0800

Make tapping more responsive Until now we used the click event to make links and buttons do   something. This, unfortunately, causes a 300ms delays on all mobile browsers between the actual tap (touchend) and the callback being invoked. This patch introduces a small library that adds a tap event for a more responsive UI. On browsers without touch events it falls back to click events. I added it in alpha in several places for now: hamburger, overlay close button, search input and page actions. If it works well, we could use it   everywhere instead of using click events. Change-Id: Ib487355d86803fb09f169b573575b2a34f456ada

commit c24da47867dab354d0a8ba78825fb4791e27a6f3 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Sat Aug 10 19:33:00 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Id3f00adbda449d34ced447e73d94ff595596b50f

commit 5409310346c2d69770de5479c46ea98d02b6436f Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Fri Aug 9 19:43:13 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Ibedd58696ea7833cba4225abcabf728c26a01e1e

commit 30bf338a7ef58872d5ba5b1dac4225272968819a Author: jrobson <jrobson@wikimedia.org> Date:  Fri Aug 9 13:50:41 2013 +0800

Bug 51647: Allow right clicking on nearby Change-Id: I3b9c803ca51ff26e631dbdb15f859d3cdc33fd80

commit 09cfbd9b82dca31ffcae6f034bb37ec879012ff3 Author: jrobson <jrobson@wikimedia.org> Date:  Tue Jul 2 12:52:08 2013 -0700

Remove echo specific css to reflect html changes Change-Id: Ibaf29d0b2efc45f7067ae01c7cd13672dd4bba81

commit 843cbe8438fcc0e26fc77ff43c36d0c8fd625ff6 Author: jrobson <jrobson@wikimedia.org> Date:  Fri Aug 9 12:36:01 2013 +0800

Bug 51697: Support all types of talk Change-Id: Ic8fbddb55c3f3c2b51b389c7074ad25923aabd76

commit b0961d0b44ea01eb5d2180810ee0149ccdef3792 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Thu Aug 8 20:00:41 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I6a548962d09ac262635549008b8c01263545f7e3

commit 4465d46ec123022210557a1f7718b31f7036f619 Author: kaldari <kaldari@gmail.com> Date:  Fri Aug 2 14:50:48 2013 -0700

Removing related links hatnotes from preview output See https://en.wikipedia.org/wiki/Template:Rellink As used in https://en.wikipedia.org/wiki/Liu_Shaoqi for example. Also improving comments. Change-Id: I09e7f6b66bd77bea25c072938c53f43b0ec17b08

commit 882471073953360d7f926f7c379bb9fde5e68758 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Wed Aug 7 19:44:41 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I6141445c8bceebf7ac6a43cf5a8a1039769ee884

commit 64e9133b276d6cb34d861fb808b718ab784efee1 Author: Michelle Grover <jcmish1@gmail.com> Date:  Tue Aug 6 21:45:35 2013 -0600

change content_0 element to content to fix tests Change-Id: I6b4dc0dd346431b6de9383c87c38f6af2196f692

commit e56de5ff76a9cfdb13c99bf7021a643d26d6f27f Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Tue Aug 6 19:28:20 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Ia3d365dec0e313a9c850cb32b9ea90297bffea7f

commit 128817662ae45db627d240c722b8a53ddb621a9b Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Mon Aug 5 19:36:59 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: Iddcc731a6a15fecccf8f293a46840b68d6789ff7

commit e6fd90cdc7dbd4bd26f6f57d2e03f6007e38a3f4 Author: Nemo bis <federicoleva@tiscali.it> Date:  Mon Aug 5 13:24:36 2013 +0200

Replace "article" with generic wording for content pages There is one namespace selector "Articles" left. It could maybe become "Content namespaces" or at least "Main namespace", but I suspect that's better in a separate commit. <https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Mobile-frontend-lead-image-tutorial-summary/en> Change-Id: Id21c06a5b68648730ce163670827370e176cf5c7

commit e70d6a6324b39dd434122f859d12d8b5b474fc84 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Sun Aug 4 18:54:27 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I9a1bc4134fc4fe159c65375a083fc6b51b0da595

commit f1b86adce6cf6cc975df1a2adacde440e39a123a Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Sat Aug 3 19:44:44 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I1a5c4604c3f2bbca11114619c3a7734330d7c5f2

commit bb8f3b83226e6a9507122215973204a9c7f4e7f1 Author: kaldari <kaldari@gmail.com> Date:  Fri Aug 2 12:16:51 2013 -0700

Adding new lastmodified param to MobileView API Looks like we're going to need this judging by page.js and page.html Also improving some of the API code documentation Change-Id: I1f070c50710a76a476b7999edacb6cf6965fdce6

commit 1d7ec82878f0da6a7a994c7618a64f8b4db4d9a4 Author: Max Semenik <maxsem.wiki@gmail.com> Date:  Sat Aug 3 01:41:43 2013 +0400

Don't pollute global scope Change-Id: I238294c9abec6a088cbb7f88dc4bc3f3ccb5cac6

commit ad04f7eebb7cf8e11bdaa820aa0eb0b8c95242b8 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Fri Aug 2 21:36:48 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I688145cc2672c68c0915ed086216d91d372e7767

commit 30cc24ef84bac438893c8483481473cbf23452b3 Author: kaldari <kaldari@gmail.com> Date:  Fri Aug 2 12:25:38 2013 -0700

Enforcing consistent closure format ( M, $ ) Change-Id: I5125c2dc048a25b7ea1ddf8667ffc38647b926db

commit 4e5ac0094e55146339ca2685df5f97540368a075 Author: Max Semenik <maxsem.wiki@gmail.com> Date:  Fri Aug 2 21:50:08 2013 +0400

Rm old hack that disables site and user JS   Not needed anymore as RL now honors targets Change-Id: I1900a00c5e5d5aa54213ec4d401458afc1b83e9a

commit 05f629b4e5a8e7c5891f9b1b68b1011ab6311370 Author: kaldari <kaldari@gmail.com> Date:  Fri Aug 2 10:45:17 2013 -0700

Fixing incorrect API param in M.history.retrievePage Change-Id: I24ab1df5ce7d3e20a9d9269d4264c7f5eb2cbeaf

commit b8388383ebbd93b5195b998c262f232455706905 Author: jrobson <jrobson@wikimedia.org> Date:  Fri Jul 26 12:59:17 2013 -0700

Kill use of MobileFormatter on special pages * Stop adding #section_0 to special pages * Re-instore search special page styling * Stop scrubbing search elements - instead hide in css Change-Id: I78881cd2b264ea1b3c6475238f3a3c25bce8b93f

commit 357c30abe63fee47af255106ab8a6e9e33e6e01e Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Thu Aug 1 20:12:16 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I0e7c1d1c3bb9585202042e1aa547c3ab415ac497

commit 9b3e9818d2194f1e9ec2a3361fa522143381ab91 Author: Max Semenik <maxsem.wiki@gmail.com> Date:  Thu Aug 1 23:59:22 2013 +0400

Make Nearby listed on Special:SpecialPages Bug: 49948 Change-Id: Ie1502aeb210d6483f661db33a025a768be0a3dd7

commit 1fb258a0df8e9bb7cbbee57c3ecb7f0ea81914f0 Author: Max Semenik <maxsem.wiki@gmail.com> Date:  Tue Jul 23 21:26:22 2013 +0400

Send proper X-Vary-Options Change-Id: Iae2f70422dbb9a58758faa3f20f3602a549213a9

commit 3e19365e35782424ae9ae5e4700565a42a7f0588 Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Wed Jul 31 19:58:56 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I7600282c2cbb0a8d5399258847a78de9b32a635b

commit 068fc002fe6936e3596bb5d00ebfd2be1080060d Author: Translation updater bot <l10n-bot@translatewiki.net> Date:  Tue Jul 30 20:10:48 2013 +0000

Localisation updates from http://translatewiki.net. Change-Id: I3284d018170afb41f1e4176ce3f1a27dd0606f7d

commit 8834c3dbee6396fd7e774a0b1ab33de36f1edf85 Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sat Jul 27 18:42:07 2013 -0700

Hygiene: Rewrite notification.js   This is now used only for toasts. Code reuse FTW! In the process removed lots of dead CSS and discovered that toasts' shadow was overriden in an old CSS rule (this made toasts kind of   blurry). Change-Id: I100649084f69d0503b7bc2fae7c3e22b60205a18

commit bbf640c7ce0d1360492d4f9e9e870fe490560969 Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sat Jul 27 17:45:36 2013 -0700

Hygiene: Rewrite references Now they're a drawer too! Coming soon: rewriting mf-notification.js as a View, only for toasts, without all the corner cases. Change-Id: Iac6faf7ecd92b2c98587114d852b61f4fd9180f2

commit cd47a1ae9879271c57ed0054f0927d8934875759 Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sat Jul 27 15:12:48 2013 -0700

Hygiene: Make PhotoUploadProgress a Drawer It looks like a drawer, it quacks like a drawer, therefore it's a   drawer. Change-Id: I851cb2351c15353eab2103c76c43994ab22183f0

commit 0d019ce95d83ff29083f80aa8534d275f9dc3815 Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sat Jul 27 14:41:49 2013 -0700

Make left nav menu slightly wider Accommodate for other languages and possibly wider fonts on some devices. Change-Id: I4bf32fb92420f07e7755ba10c71366f2eed8d9d7

commit ba2e5549ece0aae41ebe9c106639853b34457835 Author: Juliusz Gonera <jgonera@wikimedia.org> Date:  Sat Jul 27 14:34:05 2013 -0700

Show last line of text in editor when guider present When the guider text is present in the editor (the one explaining what   the Continue button does), the bottom bar is taller and covers the last line in the textarea. Leaving some more margin there in case the guider text is two lines long in other languages. Change-Id: I229149836c02cbc3cb0cbd84913a5957dc425683

commit 12e55b14681d2e67906aaa32f2f1259eeefa019b Author: Max Semenik <maxsem.wiki@gmail.com> Date:  Fri Jul 19 23:01:04 2013 +0400

Simplify opt-in cookies * Don't use two cookies where you can use one * Simplifies accessors greatly Change-Id: I4db3329d36ee3e5d3af276dae34fc38b4b1f70be