1387 commits

Author	SHA1	Message	Date
gorhill	d3d522ac46	fix #3213	2017-11-10 06:56:38 -05:00
gorhill	bc036724c1	code review (#3208)	2017-11-09 15:46:25 -05:00
gorhill	386e8bee9c	fix #3210	2017-11-09 12:53:05 -05:00
gorhill	3dcfc302e4	fix https://github.com/gorhill/uBlock/issues/3208#issuecomment-342900031	2017-11-08 13:29:04 -05:00
gorhill	e5afbb2ed7	further make popup panel more ARIA-friendly (#2072)	2017-11-08 07:34:22 -05:00
gorhill	9884ff115a	code review e7294a46d4: force refresh tooltip if needed	2017-11-07 17:03:24 -05:00
gorhill	e7294a46d4	fix https://github.com/gorhill/uBlock/issues/2072#issuecomment-342594160	2017-11-07 16:38:26 -05:00
gorhill	9d86ab0af9	fix #3201	2017-11-07 11:31:19 -05:00
gorhill	4d20950dfa	save investigative work for the future re. wasm	2017-11-05 12:33:46 -05:00
gorhill	da605f53a6	code review: avoid pointless test for single-char cells	2017-11-05 06:45:43 -05:00
gorhill	f71d3689a9	fix case 2 of #3199	2017-11-04 23:51:44 -04:00
gorhill	8d44bf9837	fix #3187 again, as per feedback	2017-11-03 16:51:28 -04:00
gorhill	22c460d52f	just edit comments	2017-11-03 08:36:16 -04:00
gorhill	5928996f2a	address #3193	2017-11-02 15:49:11 -04:00
gorhill	2ca8c76cb8	fix #3187	2017-11-02 11:12:17 -04:00
gorhill	3044590fa6	code review: allow free scrolling in element picker mode	2017-10-31 08:26:51 -04:00
gorhill	2db377f577	code review: lower timer delay = less risk of large backlog	2017-10-31 06:47:39 -04:00
gorhill	cbff97f8e7	code review: improve caching of high generics with exceptions	2017-10-29 13:58:46 -04:00
gorhill	25e2452722	code review: use for..of instead of for(..;..;..)	2017-10-28 16:50:44 -04:00
gorhill	005c659500	code review: improve element picker for touch-only devices	2017-10-28 09:07:41 -04:00
gorhill	bbda2a9086	code review: preemptively address https://bugzilla.mozilla.org/show_bug.cgi?id=1408996#c9	2017-10-27 14:22:45 -04:00
gorhill	d60edbfae1	code review last commit: oops	2017-10-26 06:23:57 -04:00
gorhill	44ce44aa42	code review: early injection of lookred up generic cosmetic filters when possible	2017-10-26 06:18:03 -04:00
gorhill	6b65e3f406	code review: avoid reinjecting already injected low generic cosmetic filters	2017-10-25 11:42:18 -04:00
gorhill	26e9bb7c19	code review: use Map instead of Object	2017-10-25 11:37:58 -04:00
gorhill	9952e12aff	fine tune DOM surveyor	2017-10-24 16:38:51 -04:00
gorhill	ed5dba432a	fix https://discourse.mozilla.org/t/support-ublock-origin/6746/606	2017-10-24 09:09:10 -04:00
gorhill	2bea51cc63	fix silly regression regarding the DOM surveyor	2017-10-24 07:55:35 -04:00
gorhill	7571d4c576	fix no-popups switch color in logger	2017-10-23 22:39:30 -04:00
gorhill	9b891384af	fix #3165	2017-10-23 22:27:39 -04:00
gorhill	f516cd3d26	remove unused source code	2017-10-23 13:33:35 -04:00
gorhill	a76f5b15ac	fix https://github.com/gorhill/uBlock/issues/3160#issuecomment-338509997	2017-10-23 12:21:37 -04:00
gorhill	6e18829f02	add to #2984: fix regressions, as per feedback and code review	2017-10-23 09:01:00 -04:00
gorhill	14109b33d6	minor code review	2017-10-22 14:20:33 -04:00
gorhill	ef84e6d8fd	fix https://github.com/gorhill/uBlock/issues/2984#issuecomment-338475886	2017-10-22 12:48:13 -04:00
gorhill	4f7aab695c	fix #3160	2017-10-22 08:59:29 -04:00
gorhill	6112a68faf	fix #2984	2017-10-21 13:43:46 -04:00
gorhill	95b25f7d49	fix #3150	2017-10-19 09:35:28 -04:00
gorhill	143e9c7414	more code review re. #3140	2017-10-19 08:07:00 -04:00
gorhill	7e21eec7ce	code review for #3140: handle case where both blockedURI & sourceFile are not found	2017-10-19 00:45:24 -04:00
gorhill	eb7bdba47f	fix #3140	2017-10-18 15:00:22 -04:00
gorhill	d44c54a477	code review: diregard letter case when validating popup filters as popunder ones	2017-10-13 09:52:17 -04:00
gorhill	9b83033785	code review of 7713597e (oops)	2017-10-13 09:38:16 -04:00
gorhill	7713597e3e	fix #3129, #3112, #2277	2017-10-13 09:33:02 -04:00
gorhill	0c1207bd7a	fix #3110	2017-10-09 09:28:28 -04:00
gorhill	8c33720d16	fix #3111	2017-10-08 23:47:23 -04:00
gorhill	49c19f2dcc	remove stray console.log used for development purpose	2017-10-06 13:47:39 -04:00
gorhill	4639d75896	fix #3101	2017-10-06 13:35:45 -04:00
gorhill	c49ba60f0b	minor code review	2017-10-05 08:38:34 -04:00
gorhill	bd18fe3901	fix #2793: user-friendlier normalization	2017-10-04 13:20:43 -04:00
gorhill	a6b01cb0e5	fix #3090	2017-10-04 11:14:24 -04:00
gorhill	e7e390d2e2	fix #3077	2017-10-01 07:56:28 -04:00
gorhill	ca299a394f	code review fix as per https://github.com/gorhill/uBlock/issues/2793#issuecomment-333269387	2017-09-30 10:18:41 -04:00
gorhill	6a71fc59a4	evict possible remnant of resources.txt from cache [Firefox]	2017-09-29 08:22:17 -04:00
gorhill	8559669e89	fix #2755	2017-09-28 12:53:05 -04:00
gorhill	d73b888150	fix #3060	2017-09-27 10:27:29 -04:00
gorhill	c74526a895	fix #3057	2017-09-26 16:09:35 -04:00
gorhill	83ff2ef26e	fix #3053	2017-09-26 07:54:06 -04:00
gorhill	ac481ec1f2	fix #1510	2017-09-21 11:46:15 -04:00
gorhill	e9beccba51	code review of fix #3038	2017-09-19 23:25:08 -04:00
gorhill	1b6c211fa0	fix #3038	2017-09-19 12:58:11 -04:00
gorhill	59ba5248f5	fix #3034	2017-09-18 13:06:36 -04:00
gorhill	b677600637	fix #3032 -- hopefully	2017-09-18 10:52:30 -04:00
gorhill	1e760f9429	fix #3024: regression from 5626b500	2017-09-16 07:59:56 -04:00
gorhill	2c4faaa84d	fix #3020	2017-09-16 07:49:43 -04:00
gorhill	f632171566	remove spurious space character	2017-09-14 17:54:59 -04:00
gorhill	faeedeaf56	fix #2283	2017-09-13 23:41:20 -04:00
gorhill	5626b5005a	fix #2946	2017-09-12 11:43:43 -04:00
gorhill	dfe18111b9	fix #1539	2017-09-11 09:53:42 -04:00
gorhill	c641cadea9	rename "Social" filter list category to "Annoyances"	2017-09-10 13:02:04 -04:00
gorhill	2660bee0d2	fix #2919	2017-09-05 19:49:48 -04:00
gorhill	8b4b1fa9db	properly fix #2938	2017-08-31 14:17:55 -04:00
gorhill	73387e54ad	fix #2938	2017-08-30 19:03:02 -04:00
gorhill	126110c9a0	remove ability to pull latest version of resources.txt from remote repo. ... This is required as per Firefox extension reviewers. Mail exchange: ======== Reviewer: > Do I read the code correctly that you are executing remote JS by > downloading/updating from > https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resources.txt > and injecting scripts in contentscripts.js? Me: > Yes, resources.txt contains scriptlets or other resources used to: > > - Minimize potential page breakage (e.g. google-analytics.com/ga.js); > - Defuse anti-blockers (e.g. bab-defuser.js); > - Defuse anti-blockers or minimize page breakage through redirection > (e.g. 2x2-transparent.png) > > This is not a new feature -- this is also part of the legacy version, > and I consider this is a major feature of uBO. Given how fast things can > change out there, this allows me to quickly push fixes when a new issue > is reported for a site without having to go through a full update of the > extension. Reviewer: > I am aware that this is not a new feature. I am unclear why it has been > allowed in the past, since it violates our policy about remote code > execution. I assume it was missed due to the fairly complex codebase. > > I can approve this version so you are not blocked on the migration, but > eventually, you cannot use functionality that executes remote code. > Since we're moving to a more automated review process, you will be able > to ship new versions without being blocked on a human review. Me: > Do I understand correctly that extensions such as TamperMonkey or > ViolentMonkey won't be allowed on AMO? > > Those extensions are even more permissive than uBO given a user can > import scripts from any source, while with uBO only scriptlets which are > part of the project are allowed. Reviewer: > The key difference between add-ons like Tampermonkey and uBO is that in > Tampermonkey, users are making an active and conscious decision to > download and execute that specific code. In uBO, the user did not > initiate that download/execution, nor are they even aware of it > happening. Me: > So users of TamperMonkey -- tech-savvy or not -- can download & inject > countless 3rd-party user scripts from countless authors, have them > update on their own automatically at regular interval with no user > intervention. > > On the other hand, it's not acceptable for me, the author of the > extension, who users implicitly trusted when installing the extension, > who is completely controlling and vouching for the content of > "resources.txt", to have this one 1st-party resource file[1] to be > updated at regular interval with no user intervention. > > So anyways, what is expected from me at this point? Do I need to remove > scriptlet injection and resource redirection features? Do I need to > remove only the updating part of resources.txt? > > [1] key to core features of uBO (counter anti-blockers + page breakage > mitigations) and possibly an important factor in installing the > extension. ======== Now about this commit: the purpose of the code change here is to prevent "resources.txt" -- which is part of the package -- from being updated -- this applies only to the Firefox webext[-hybrid] version of uBO.	2017-08-30 09:15:06 -04:00
gorhill	beb7933016	fix #2925	2017-08-29 18:32:00 -04:00
gorhill	b2e89c9ece	generate better regex for hostname-anchored generic filters	2017-08-24 18:30:05 -04:00
gorhill	c31d29c2e3	fix bad test: regression from fdcc9515	2017-08-24 17:54:27 -04:00
gorhill	63be43a365	shield content script against exceptions in injected scriptlets	2017-08-21 12:04:35 -04:00
gorhill	a1350b8cff	fix #2882	2017-08-17 09:54:01 -04:00
gorhill	fdcc9515dc	fix #2029	2017-08-17 08:25:02 -04:00
gorhill	d1c752da29	fix bad English in comment	2017-08-16 18:06:04 -04:00
gorhill	797082a36c	fix #2552	2017-08-16 14:10:41 -04:00
gorhill	5f72565f7a	fix #2873	2017-08-15 09:09:16 -04:00
gorhill	0e078e536d	eliminate validation warning on AMO: avoid innerHTML	2017-08-11 14:26:15 -04:00
gorhill	eb3519b075	fix #2839	2017-08-03 10:18:05 -04:00
gorhill	43512277c6	fix #2835	2017-07-31 17:03:09 -04:00
gorhill	645c862886	always set browserAction title	2017-07-25 09:16:48 -04:00
gorhill	906cb34716	make uBO/webext functional on Firefox for Android Nightly	2017-07-24 19:25:49 -04:00
gorhill	d866e4d472	add proper handling of potentially unsupported webext APIs	2017-07-24 11:35:22 -04:00
gorhill	0d892a8856	fix #2810	2017-07-23 09:56:43 -04:00
gorhill	48ee02980b	remove stray code change from f5ef83719c	2017-07-22 17:13:21 -04:00
gorhill	b429e1c7ba	fix #2813	2017-07-22 16:58:08 -04:00
gorhill	f5ef83719c	address #2806	2017-07-21 07:48:50 -04:00
gorhill	f1036395f7	add workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1360285	2017-07-19 09:36:17 -04:00
gorhill	49d287994f	remove obsolete default whitelist directive	2017-07-14 07:49:58 -04:00
gorhill	36317e67a2	#2781: code review, small fine tuning	2017-07-13 14:34:43 -04:00
gorhill	3aed25ff2c	#2781: code review, try a bit harder to find a good token	2017-07-11 15:04:25 -04:00
gorhill	f0ea2b6f9a	#2781: code review	2017-07-11 13:57:31 -04:00
gorhill	2862368a99	fix #2781	2017-07-11 12:21:08 -04:00
gorhill	93f575c4c0	fix https://github.com/gorhill/uBlock/issues/2776#issuecomment-313922863	2017-07-09 10:39:23 -04:00
gorhill	7fb034f640	minor code review: logData can still be set when not logging	2017-07-09 08:45:55 -04:00
gorhill	9701a519a2	really fix #2776	2017-07-09 06:58:34 -04:00
gorhill	974194ab8d	fix #2776	2017-07-08 20:03:37 -04:00
gorhill	9ac4dc9f81	fix #2768	2017-07-07 11:23:24 -04:00
gorhill	186c119202	fix #2753	2017-07-03 10:54:30 -04:00
gorhill	414765f526	code review: fix workaround for legacy FF	2017-07-03 10:50:47 -04:00
gorhill	2cb8ddbe03	fix #2740	2017-07-03 10:20:47 -04:00
gorhill	a8382e821d	work around for #2734 until fixed in Nightly	2017-07-03 09:51:34 -04:00
gorhill	20346ef0ed	auto-convert removed stock list into an imported list	2017-07-03 09:08:46 -04:00
gorhill	d337abe504	minor code review	2017-06-22 14:36:45 -04:00
Sean Stangl	88fcf53d34	Check childElementCount directly. (#2725)	2017-06-21 20:09:19 -04:00
gorhill	9b55684551	fix #2718	2017-06-21 15:49:42 -04:00
gorhill	5ee1fa7684	fix #2720	2017-06-21 07:17:44 -04:00
gorhill	84f22ce3a6	code review: do not pollute logger with firewall noop rules	2017-06-14 08:32:12 -04:00
gorhill	2c9c98eb79	fix #2664	2017-06-07 17:35:22 -04:00
gorhill	6b293dd58b	code review: put back erroneously removed line	2017-06-07 13:20:35 -04:00
gorhill	e17e9c804a	fix #1754	2017-06-05 09:26:11 -04:00
gorhill	cc935ee19a	minor fine tuning	2017-06-02 08:17:09 -04:00
gorhill	dbe95c438b	fix #2666	2017-05-31 11:49:37 -04:00
gorhill	5b66a8419d	ignore "Delete" key in element picker mode	2017-05-31 07:26:01 -04:00
gorhill	c7a9befdab	fix #2664	2017-05-30 13:04:01 -04:00
gorhill	9c79840134	fix #2663	2017-05-30 11:38:45 -04:00
gorhill	062846a7d2	make zapper compatible with touch screens	2017-05-29 10:38:22 -04:00
gorhill	1581ec20d8	fix #2659 (regression)	2017-05-28 16:57:02 -04:00
gorhill	189c9d55dd	convenience: shift-click to stay in element-zapper mode	2017-05-28 13:45:11 -04:00
gorhill	c1589cafaa	fix popup panel layout as per feedback: 39aeaa12a7 (commitcomment-22310294)	2017-05-28 13:32:08 -04:00
gorhill	d50e76745d	fix #2658	2017-05-28 12:21:56 -04:00
gorhill	95f29c98fd	fix #2658	2017-05-28 10:53:13 -04:00
gorhill	78d9c4d1c5	implement opening logger with kbd shortcut	2017-05-28 09:40:26 -04:00
gorhill	9a4681d4e1	fix #2656	2017-05-27 14:31:46 -04:00
gorhill	39aeaa12a7	new feature: element zapper	2017-05-27 11:51:24 -04:00
gorhill	aae97b8535	fix badfilter option; performance work ... - badfilter option was no longer working following last refactoring changes. - performance work: - reduce duplication of large strings. - new lighter FilterBucket to use when only 2 filters: FilterPair.	2017-05-26 20:00:21 -04:00
gorhill	1c685c86a7	mind https://bugs.chromium.org/p/v8/issues/detail?id=2869	2017-05-26 12:46:36 -04:00
gorhill	8d2319e011	fix "purge all" button not disabled when there is nothing left to purge	2017-05-26 08:31:19 -04:00
gorhill	f3e6057e07	fix #2598: refactor to address the cause rather than the symptoms	2017-05-25 17:46:59 -04:00
gorhill	a4ec9f5dae	fix #2640	2017-05-23 12:16:53 -04:00
gorhill	fd776bbf51	fix #2622	2017-05-20 17:05:55 -04:00
gorhill	fd03683045	minor code review: it makes no difference, I just prefer no indent there	2017-05-20 16:32:42 -04:00
gorhill	be9d76f43d	fix #2624	2017-05-20 15:35:19 -04:00
gorhill	3109d19e3c	code review: avoid compiling twice when list is fetched from remote location the 1st time	2017-05-20 15:32:03 -04:00
gorhill	da5f1c80d3	fix long latent issue exposed by acf7562b0f	2017-05-19 21:07:37 -04:00
gorhill	acf7562b0f	minor code review	2017-05-19 20:22:26 -04:00
gorhill	853f012802	fix #2631: regression introduced in 0232382695	2017-05-19 20:21:28 -04:00
gorhill	fcf43d972e	tentatively fix issue reported in #2612 re. FFox 24.8.1	2017-05-19 10:12:55 -04:00
gorhill	a222e23e49	fix #2630	2017-05-19 08:45:19 -04:00
gorhill	92f94c7765	minor formatting change	2017-05-18 18:55:03 -04:00
gorhill	5f63398af8	fix regression reported at http://forums.mozillazine.org/viewtopic.php?p=14748380#p14748380	2017-05-17 17:40:55 -04:00
gorhill	0464075dfc	code review: fix "logger enabled" code paths re. csp injection	2017-05-17 09:25:11 -04:00
gorhill	ca32a693df	fix regression re. badfilter option	2017-05-16 20:03:02 -04:00
gorhill	da71918112	code review "csp=" parsing: reject if "report-" directive present	2017-05-16 12:44:12 -04:00
gorhill	29b1e87a92	make key always numerical since only native Map() is used, as per #2612	2017-05-16 10:25:00 -04:00
gorhill	fc9764d51a	merge changes from master	2017-05-15 13:51:03 -04:00
gorhill	139d97179f	as per #2612, use native Set() in content scripts	2017-05-15 08:51:25 -04:00
gorhill	8f42232105	fix #2609	2017-05-14 12:01:56 -04:00
gorhill	892d9b504a	minor code review while at it	2017-05-13 08:57:30 -04:00
gorhill	f1805d8175	fix #2607	2017-05-13 08:51:56 -04:00
gorhill	721993b488	remove stray console.log	2017-05-12 11:49:00 -04:00
gorhill	0232382695	refactor static network filtering, add support for csp injection	2017-05-12 10:35:11 -04:00
gorhill	ea47cae003	fix #2599	2017-05-09 08:58:30 -04:00
gorhill	1c7c703d8b	fix #2594	2017-05-08 14:00:41 -04:00
gorhill	622d8f22fb	minor code review re. #2592	2017-05-08 12:12:56 -04:00
gorhill	22d74421e3	fix #2594	2017-05-08 11:49:48 -04:00
gorhill	fe61cdddee	fix #2585	2017-05-06 13:19:16 -04:00
gorhill	42afd0c3d0	code review: to/from punycode conversion only if needed	2017-05-03 19:43:09 -04:00
gorhill	9a3288a166	Revert "more cases re #2529". Reason: breaks links in dashboard on Firefox. ... This reverts commit 3c0022d73a.	2017-04-29 10:07:18 -04:00
gorhill	3c0022d73a	more cases re #2529	2017-04-27 09:09:29 -04:00
gorhill	e50a05a8d0	minor code review	2017-04-26 12:50:05 -04:00
gorhill	669be3d45d	fine tune tooltips in 3rd-party lists pane	2017-04-26 12:21:01 -04:00
gorhill	3ce3ed2a0e	code review: simplify CSP injection code	2017-04-24 19:11:13 -04:00
gorhill	733917d176	fix #2526: better handle timeout conditions	2017-04-23 09:00:15 -04:00
gorhill	de3d99ed13	re. #2550: just implement the logic used to solve https://bugs.chromium.org/p/chromium/issues/detail?id=683314	2017-04-22 19:24:20 -04:00
gorhill	52332da623	improve solution to #2550: mind only the 22 confusable unicode characters	2017-04-22 14:26:17 -04:00
gorhill	0b3d1477f2	add basic mitigation to potential abuse of IDN	2017-04-22 12:57:56 -04:00
gorhill	582edd5e62	fix #2519	2017-04-08 10:40:38 -04:00
gorhill	510eba6bc4	fix #2477	2017-04-04 16:45:50 -04:00
gorhill	51ade9f043	code review re. https://github.com/uBlockOrigin/uAssets/issues/192#issuecomment-285904675	2017-03-21 08:23:21 -04:00
gorhill	2dcf7b7974	fix #2464	2017-03-20 15:54:41 -04:00
gorhill	64c92a96a3	fix https://github.com/nikrolls/uBlock-Edge/issues/64	2017-03-16 19:31:14 -04:00
gorhill	d7f751d42b	fix #2440	2017-03-16 19:14:25 -04:00
gorhill	53b0db3d25	fix #2447	2017-03-14 15:09:40 -04:00
gorhill	cf123b9264	fix #2448	2017-03-13 13:03:51 -04:00
gorhill	0d2c0a5ba3	fix #2450	2017-03-13 10:07:26 -04:00
gorhill	7a023077b3	performance work for pseudo-user styles code	2017-03-12 10:22:46 -04:00
gorhill	a4e20ae3ad	new filter option: "badfilter" (see https://github.com/uBlockOrigin/uAssets/issues/192)	2017-03-11 13:55:47 -05:00
gorhill	7e55ddf16b	re. websocket: mind backward compatibility	2017-03-06 17:53:25 -05:00
gorhill	2213b005a0	forgot to add "ws://*/*"/"wss://*/*" to enable support for websocket type"	2017-03-06 17:34:46 -05:00
gorhill	5015826546	fix #2267	2017-03-05 12:54:47 -05:00
gorhill	4d1ed37556	Firefox WebExt readiness (#622) + support more webRequest types when available (websocket, font, csp_report)	2017-03-05 08:25:55 -05:00
Nik Rolls	a121f2261d	DOM Inspector: Fallback to .childNodes when .children not present (#2242) ... When the browser does not support .children on the svgRoot element (MS Edge, for example), filter childNodes for elements and use that list instead.	2017-02-28 01:19:00 -05:00
gorhill	798e21de36	fix #2414	2017-02-27 16:29:36 -05:00
gorhill	1c4347d69d	element picker improvement: to not discard class information when an id is available ... Use class(es) whenever available instead of the id when selecting a broad cosmetic filter (ctrl-click). When asking for a broad cosmetic filter, using the id instead of whatever available class(es) is limiting usefulness. The change here address this. Example of use case: open <http://forums.mozillazine.org/viewtopic.php?f=38&t=3027325>. Now how to remove all signature widgets from all posts? Without the change here, this was not possible without opening the browser's inspector, finding out and manually typing whatever class is used to identify the signature's root element. With this commit, ctrl-click will now use whatever class information exist instead of the id.	2017-02-13 08:33:10 -05:00
gorhill	28084e1dc9	code review: marginal performance improvement	2017-02-12 15:53:40 -05:00
gorhill	1e1508cdd2	code review of dynamic URL filtering engine	2017-02-11 11:44:18 -05:00
gorhill	cbca48307c	fix https://github.com/gorhill/uBlock/pull/2314#issuecomment-278716960	2017-02-09 13:33:32 -05:00
gorhill	7176ecb3e7	code review of fix to #2360	2017-02-07 08:05:39 -05:00
gorhill	a742f09dd4	fix #2360	2017-02-06 15:34:31 -05:00
gorhill	1bceca9cbb	fix var name (https://github.com/el1t/uBlock-Safari/issues/25#issuecomment-277506943))	2017-02-05 07:43:28 -05:00
gorhill	60605033bf	fix #1871? ("blind" fix, need confirmation)	2017-02-03 08:12:26 -05:00
gorhill	0b4f31bd8a	fix #2344	2017-01-27 13:44:52 -05:00
gorhill	aadf4a6427	fix #2340	2017-01-26 10:17:38 -05:00