Commit Graph

622 Commits

Author SHA1 Message Date
Florian Weimer
051a34bb83 Auto-sync with upstream master
Upstream commit: 2585d7b839559e665d5723734862fbe62264b25d

- Do not use generic selection in C++ mode
- Do not use __builtin_types_compatible_p in C++ mode (#1481205)
- x86-64: Check FMA_Usable in ifunc-mathvec-avx2.h (swbz#21966)
- Various locale fixes (swbz#21750, swbz#21960, swbz#21959, swbz#19852)
- Fix sigval namespace (swbz#21944)
- x86-64: Optimize e_expf with FMA (swbz#21912)
- Adjust glibc-rh827510.patch.
2017-08-21 14:17:58 +02:00
Florian Weimer
66a1c9c9cb Auto-sync with upstream master
Upstream commit: 403143e1df85dadd374f304bd891be0cd7573e3b

- x86-64: Align L(SP_RANGE)/L(SP_INF_0) to 8 bytes (swbz#21955)
- powerpc: Add values from Linux 4.8 to <elf.h>
- S390: Add new s390 platform z14.
- Various locale fixes (swbz#14925, swbz#20008, swbz#20482, swbz#12349
  swbz#19982, swbz#20756, swbz#20756, swbz#21836, swbz#17563, swbz#16905,
  swbz#21920, swbz#21854)
- NSS: Replace exported NSS lookup functions with stubs (swbz#21962)
- i386: Do not set internal_function
- assert: Suppress pedantic warning caused by statement expression (swbz#21242)
- powerpc: Restrict xssqrtqp operands to Vector Registers (swbz#21941)
- sys/ptrace.h: remove obsolete PTRACE_SEIZE_DEVEL constant (swbz#21928)
- Remove __qaddr_t, __long_double_t
- Fix uc_* namespace (swbz#21457)
- nss: Call __resolv_context_put before early return in get*_r (swbz#21932)
- aarch64: Optimized memcpy for Qualcomm Falkor processor
- manual: Document getcontext uc_stack value on Linux (swbz#759)
- i386: Add <startup.h> (swbz#21913)
- Don't use IFUNC resolver for longjmp or system in libpthread (swbz#21041)
- Fix XPG4.2 bits/sigaction.h namespace (swbz#21899)
- x86-64: Add FMA multiarch functions to libm
- i386: Support static PIE in start.S
- Compile tst-prelink.c without PIE (swbz#21815)
- x86-64: Use _dl_runtime_resolve_opt only with AVX512F (swbz#21871)
- x86: Remove __memset_zero_constant_len_parameter (swbz#21790)
2017-08-16 17:18:35 +02:00
Carlos O'Donell
8742b0f949 glibc-2.26-1
Auto-sync with upstream release/2.26/master

Upstream commit: 2aad4b04ad7b17a2e6b0e66d2cb4bc559376617b

- Update to released 2.26 branch.
- getaddrinfo: Release resolver context on error in gethosts (swbz#21885)
2017-08-03 09:47:24 -04:00
Florian Weimer
8b0d66e92b Auto-sync with upstream master
Upstream commit: 5920a4a624b1f4db310d1c44997b640e2a4653e5
2017-07-29 08:18:06 +02:00
Florian Weimer
7e4694d522 Auto-sync with upstream master
Upstream commit: d95fcb2df478efbf4f8537ba898374043ac4561f
2017-07-28 21:00:29 +02:00
Florian Weimer
37c3363a24 Auto-sync with upstream master
Upstream commit: 00d7a3777369bac3d8d44152dde2bb7381984ef6

- aarch64: Fix out of bound array access in _dl_hwcap_string
2017-07-19 09:05:38 +02:00
Florian Weimer
6702ca3c64 Auto-sync with upstream master
Upstream commit: 91ac3a7d8474480685632cd25f844d3154c69fdf

- Drop glibc-rh1467518.patch in favor of upstream patch (#1467518)
- Fix pointer alignment in NSS group merge result construction (#1471985)
- Various locale fixes
2017-07-17 23:07:00 +02:00
Carlos O'Donell
705ca30d3e Auto-sync with upstream master
Upstream commit: de895ddcd7fc45caeeeb0ae312311b8bd31d82c5:

- Added Fiji Hindi language locale for Fiji (swbz#21694).
- Added yesstr/nostr for nds_DE and nds_NL (swbz#21756).
- Added yesstr and nostr for Tigrinya (swbz#21759).
- Fix LC_MESSAGES and LC_ADDRESS for anp_IN (swbz#21760).
- Added yesstr/nostr and fix yesexpr for pap_AW and pap_CW (swbz#21757).
- Added Tongan language locale for Tonga (swbz#21728).
- [ARM] Fix ld.so crash when built using Binutils 2.29.
- Added yesstr and nostr for aa_ET (swbz#21768).
- New locale for bi_VU (swbz#21767).
- Disable single thread optimization for open_memstream

Dropped patches:

- armv7hl: Drop 32-bit ARM build fix, already in upstream master.
- s390x: Apply glibc fix again, removing PTRACE_GETREGS etc. (#1469536).
2017-07-14 21:36:54 -04:00
Florian Weimer
419878ed02 Auto-sync with upstream master
Upstream commit: 30200427a99e5ddac9bad08599418d44d54aa9aa

- Add per-thread cache to malloc
- Add Samoan language locale for Samoa
- Add Awajún / Aguaruna locale for Peru
- CVE-2010-3192: Avoid backtrace from __stack_chk_fail (swbz#12189)
- Add preadv2, writev2 RWF_NOWAIT flag (swbz#21738)
- Fix abday strings for ar_JO/ar_LB/ar_SY locales (swbz#21749)
- Fix abday strings for ar_SA locale (swbz#21748, swbz#19066)
- Set data_fmt for da_DK locale (swbz#17297)
- Add yesstr and nostr for the zh_HK locale (swbz#21733)
- Fix abday strings for the ksIN@devanagari locale (swbz#21743)
- Do not include _dl_resolv_conflicts in libc.a (swbz#21742)
- Test __memmove_chk, __memset_chk only in libc.so (swbz#21741)
- Add iI and eE to  yesexpr and noexpr respectively for ts_ZA locale
- Add yesstr/nostr for kw_GB locale (swbz#21734)
- Add yesstr and nostr for the ts_ZA locale (swbz#21727)
- Fix LC_NAME for hi_IN locale (swbz#21729)
- Add yesstr and nostr for the xh_ZA locale (swbz#21724)
- Add yesstr and nostr for the zh_CN locale (swbz#21723)
- Fix full weekday names for the ks_IN@devanagari locale (swbz#21721)
- Various fixes to Arabic locales after CLDR import
2017-07-12 14:00:32 +02:00
Florian Weimer
667333c331 Auto-sync with upstream master
Upstream commit: 031e519c95c069abe4e4c7c59e2b4b67efccdee5

- x86-64: Align the stack in __tls_get_addr (#1440287)
- Add Tok-Pisin (tpi_PG) locale.
- Add missing yesstr/nostr for Pashto locale (swbz#21711)
- Add missing yesstr/nostr for Breton locale (swbz#21706)
- Single threaded stdio optimization
- sysconf: Use conservative default for _SC_NPROCESSORS_ONLN (swbz#21542)
2017-07-06 14:29:12 +02:00
Florian Weimer
84baf402f0 Auto-sync with upstream master
Upstream commit: 4446a885f3aeb3a33b95c72bae1f115bed77f0cb
2017-07-04 15:31:23 +02:00
Florian Weimer
44e7da869e Auto-sync with upstream master
Upstream commit: 89f6307c5d270ed4f11cee373031fa9f2222f2b9
2017-07-04 11:36:06 +02:00
Florian Weimer
dcf3eeb5c0 Auto-sync with upstream master
Upstream commit: e237357a5a0559dee92261f1914d1fa2cd43a1a8

- Support an arbitrary number of search domains in the stub resolver (#168253)
- Detect and apply /etc/resolv.conf changes in libresolv (#1374239)
- Increase malloc alignment on i386 to 16 (swbz#21120)
- Make RES_ROTATE start with a random name server (swbz#19570)
- Fix tgmath.h totalorder, totalordermag return type (swbz#21687)
- Miscellaneous sys/ucontext.h namespace fixes (swbz#21457)
- Rename struct ucontext tag (swbz#21457)
- Call exit system call directly in clone (swbz#21512)
- powerpc64le: Enable float128
- getaddrinfo: Merge IPv6 addresses and IPv4 addresses (swbz#21295)
- Avoid .symver on common symbols (swbz#21666)
- inet_pton: Reject IPv6 addresses with many leading zeros (swbz#16637)
2017-07-03 21:49:42 +02:00
Florian Weimer
093184feca Auto-sync with upstream master
Upstream commit: 3ec7c02cc3e922b9364dc8cfd1d4546671b91003
2017-06-23 17:43:54 +02:00
Florian Weimer
9a4cee58e4 Auto-sync with upstream master
Upstream commit: 12f50337ae80672c393c2317d471d097ad92c492
2017-06-23 13:25:59 +02:00
Florian Weimer
aae7c7249a Auto-sync with upstream master
Upstream commit: 0a47d031e44f15236bcef8aeba80e737bd013c6f
2017-06-22 13:34:40 +02:00
Florian Weimer
8a569a02e8 Auto-sync with upstream master
Upstream commit: 9649350d2ee47fae00794d57e2526aa5d67d900e
2017-06-21 20:49:15 +02:00
Florian Weimer
fda3e070a7 Auto-sync with upstream master
Upstream commit: 43e0ac24c836eed627a75ca932eb7e64698407c6
2017-06-21 11:08:15 +02:00
Florian Weimer
87bc7c9489 Resolves: #1462820
- Drop glibc-Disable-buf-NULL-in-login-tst-ptsname.c, applied upstream.
- Auto-sync with upstream master,
  commit 37e9dc814636915afb88d0779e5e897e90e7b8c0, fixing:
- CVE-2017-1000366: Avoid large allocas in the dynamic linker (#1462820)
- wait3 namespace (swbz#21625)
- S390: Sync ptrace.h with kernel (swbz#21539)
- Another x86 sys/ucontext.h namespace issue (swbz#21457)
- siginterrupt namespace (swbz#21597)
- Signal stack namespace (swbz#21584)
- Define struct rusage in sys/wait.h when required (swbz#21575)
- S390: Fix build with gcc configured with --enable-default-pie (swbz#21537)
- Update timezone code from tzcode 2017b
- nptl: Invert the mmap/mprotect logic on allocated stacks (swbz#18988)
- PowerPC64 ELFv2 PPC64_OPT_LOCALENTRY
- Make copy of <bits/std_abs.h> from GCC (swbz#21573)
- localedata: ce_RU: update weekdays from CLDR (swbz#21207)
- localedata: Remove trailing spaces (swbz#20275)
- XPG4 bsd_signal namespace (swbz#21552)
- Correct collation rules for Malayalam (swbz#19922, swbz#19919)
- waitid namespace (swbz#21561)
- Condition signal.h inclusion in sys/wait.h (swbz#21560)
- ld.so: Consolidate 2 strtouls into _dl_strtoul (swbz#21528)
- tst-timezone race (swbz#14096)
- Define SIG_HOLD for XPG4 (swbz#21538)
- struct sigaltstack namespace (swbz#21517)
- sigevent namespace (swbz#21543)
- Add shim header for bits/syscall.h (swbz#21514)
- namespace issues in sys/ucontext.h (swbz#21457)
- posix: Implement preadv2 and pwritev2
- Various float128 and tunables improvements
2017-06-20 00:18:02 +02:00
Arjun Shankar
7f4621301d Auto-sync with upstream master
Upstream commit: cfa9bb61cd09c40def96f042a3123ec0093c4ad0
2017-05-31 16:22:21 +02:00
Arjun Shankar
4014d6f877 Auto-sync with upstream master
Upstream commit: 231a59ce2c5719d2d77752c21092960e28837b4a
2017-05-23 14:37:59 +02:00
Carlos O'Donell
056f48952a Auto-sync with upstream master
Upstream commit: 25e39b4229fb365a605dc4c8f5d6426a77bc08a6
2017-05-01 13:23:28 -04:00
Florian Weimer
04b4101e8f Auto-sync with upstream master
Upstream commit: a10e9c4e53fc652b79abf838f7f837589d2c84db
2017-03-02 20:09:14 +01:00
Florian Weimer
5bc3170c40 Auto-sync with upstream release/2.25/master
Upstream commit: 93cf93e06ce123439e41d3d62790601c313134cb
2017-02-28 17:43:41 +01:00
Carlos O'Donell
aa4db12ee0 glibc-2.25-1
- Update to final released glibc 2.25.

The glibc rawhide builds must stay on 2.25 branch until
F26 branches from rawhide. This assures that we have ABI/API
guarantees provided by upstream. Please do not rebase rawhide
against glibc master.
2017-02-08 21:22:46 -05:00
Florian Weimer
574cbae985 Auto-sync with upstream master
Upstream commit: 5653ab12b4ae15b32d41de7c56b2a4626cd0437a
2017-01-25 16:39:15 +01:00
Carlos O'Donell
edb6156880 Auto-sync with upstream master
Upstream commit: 468e525c81a4af10f2e613289b6ff7c950773a9e
2017-01-12 22:17:58 -05:00
Florian Weimer
c659285752 Auto-sync with upstream master
Upstream commit: 73dfd088936b9237599e4ab737c7ae2ea7d710e1
2017-01-02 13:32:25 +01:00
Florian Weimer
4570c40835 Auto-sync with upstream master
Upstream commit: cecbc7967f0bcac718b6f8f8942b58403c0e917c
2016-12-26 11:22:24 +01:00
Carlos O'Donell
a681b7b4e2 Auto-sync with upstream master
Upstream commit: 81e0662e5f2c342ffa413826b7b100d56677b613
2016-12-23 18:31:06 -05:00
Florian Weimer
ace066ccd1 Auto-sync with upstream master
Upstream commit: e077349ce589466eecd47213db4fae6b80ec18c4
2016-12-18 15:43:05 +01:00
Florian Weimer
5617e2c469 Auto-sync with upstream master
Upstream commit: 92dcaa3e2f7bf0f7f1c04cd2fb6a317df1a4e225
2016-12-12 19:26:23 +01:00
Florian Weimer
8076ad58d9 Auto-sync with upstream master
Upstream commit: 0abbe7cd700951082b314182a0958d65238297ef

GDB pretty-printers for NPTL types are temporarily disabled
due to bug 1403329.
2016-12-09 18:38:16 +01:00
Florian Weimer
b766add297 Auto-sync with upstream master
Upstream commit: 01b23a30b42a90b1ebd882a0d81110a1542e504a
2016-12-02 17:13:31 +01:00
Florian Weimer
eaa5674199 Auto-sync with upstream master
Upstream commit: 9e78f6f6e7134a5f299cc8de77370218f8019237
2016-11-30 16:12:57 +01:00
Florian Weimer
93ddbf99ee Auto-sync with upstream master
Upstream commit: 7a5e3d9d633c828d84a9535f26b202a6179978e7
2016-11-23 13:38:43 +01:00
Florian Weimer
434cf9e2e2 Auto-sync with upstream master
Upstream commit: 5ee1a4443a3eb0868cef1fe506ae6fb6af33d4ad
2016-11-22 11:10:50 +01:00
Florian Weimer
835049c53c Auto-sync with upstream master
Upstream commit: 530862a63e0929128dc98fbbd463b120934434fb
2016-11-16 14:43:20 +01:00
Florian Weimer
573bcacc8f Auto-sync with upstream master
Upstream commit: 9032070deaa03431921315f973c548c2c403fecc
2016-11-02 12:06:16 +01:00
Florian Weimer
762e747b11 Auto-sync with upstream master
Upstream commit: e37208ce86916af9510ffb9ce7b3c187986f07de
2016-10-22 17:42:34 +02:00
Florian Weimer
9d7b7a7a04 Auto-sync with upstream master
Upstream commit: b3918c44db615637b26d919ce599cd86592316b3
2016-10-21 18:38:39 +02:00
Florian Weimer
4f53fe474e Auto-sync with upstream master
Upstream commit: 5140d036f9c16585448b5908c3a219bd96842161
2016-10-07 17:54:03 +02:00
Florian Weimer
0b05408588 Auto-sync with upstream master
Upstream commit: ff88ee7edfaa439e23c42fccaf3a36cd5f041894
2016-10-04 19:29:14 +02:00
Florian Weimer
0adb9076a4 Auto-sync with upstream master
Upstream commit: 17af5da98cd2c9ec958421ae2108f877e0945451
2016-09-22 13:31:39 +02:00
Carlos O'Donell
36702a1359 Auto-sync with upstream master.
Upstream commit: e299076fefd9649f78f853865d4745043e50813c
2016-09-20 23:29:23 -04:00
Florian Weimer
77d2ac8e00 Auto-sync with upstream master
Upstream commit: 4d728087ef8cc826b05bd21d0c74d4eca9b1a27d
2016-09-01 16:11:33 +02:00
Florian Weimer
c097c5b5f7 Auto-sync with upstream master
Upstream commit: 7e625f7e85b4e88f10dbde35a0641742af581806
2016-08-26 19:45:02 +02:00
Florian Weimer
82db94894e Auto-sync with upstream master
Upstream commit: 66abf9bfbe24ac1e7207d26ccad725ed938dc52c
2016-08-21 16:49:12 +02:00
Florian Weimer
90f786e56b Auto-sync with upstream master.
Upstream commit: ID d9067fca40b8aac156d73cfa44d6875813555a6c
2016-08-17 15:23:48 +02:00
Florian Weimer
f6288a0045 Auto-sync with upstream master.
Upstream commit ID is f79211792127f38d5954419bb3784c8eb7f5e4e5.
2016-08-11 13:42:52 +02:00
Carlos O'Donell
4c8a26717a Auto-sync with upstream master. 2016-08-08 09:58:02 -04:00
Florian Weimer
8d10e61144 Auto-sync with upstream master
Up to commit f531f93056b34800383c5154280e7ba5112563c7.
2016-07-13 14:23:26 +02:00
Florian Weimer
9a78be1808 Resolves: #1351737
glibc: strcasecmp failure on ppc64le
2016-07-05 18:40:25 +02:00
Florian Weimer
d21f299cb3 Resolves: #1348620, #1344480, #1346070
Sync with upstream master, commit a3b473373ee43a292f5ec68a7fda6b9cfb26a9b0
2016-06-21 21:50:42 +02:00
Florian Weimer
c8064eb721 Auto-sync with upstream master
Resolves: #1344480
  (Crash in the nss_db NSS service module during iteration.)
Add the eo locale as a first-class citizen.
2016-06-12 22:41:55 +02:00
Florian Weimer
d3f78ebc81 Auto-sync with upstream master. 2016-06-09 12:22:07 +02:00
Florian Weimer
db9848cdc3 Sync with upstream master branch
Resolves #1326903, #1337140.
2016-06-01 08:30:29 +02:00
Florian Weimer
ddd7733205 Auto-sync with upstream master
Drop glibc-nsswitch-Add-group-merging-support.patch, applied upstream.
Drop glibc-rh1252570.patch, alternative fixes applied upstream.
Adjust glibc-rh1315108.patch to minor upstream change.
Update SUPPORTED file.
2016-05-09 13:47:51 +02:00
Carlos O'Donell
fe4ad2a06e Auto-sync with upstream master. 2016-04-29 23:08:42 -04:00
Florian Weimer
4ac7c7b403 Auto-sync with upstream master 2016-04-14 22:49:32 +02:00
Florian Weimer
85759f3e8d Auto-sync with upstream master 2016-04-14 12:59:40 +02:00
Florian Weimer
34d510b5de Auto-sync with upstream master
This removes the type union wait from the installed headers.
Update the SUPPORTED file with upstream changes
2016-04-14 10:00:03 +02:00
Florian Weimer
ec0dd75135 Auto-sync with upstream master 2016-04-08 16:21:37 +02:00
Florian Weimer
887080ee79 Auto-sync with upstream master 2016-03-29 13:04:25 +02:00
Carlos O'Donell
99a6d4df1b Auto-sync with upstream master. 2016-03-07 11:47:23 -05:00
Carlos O'Donell
dd72bee11f Sync with upstream master after 2.23 branch.
- Drop glibc-CVE-2015-7547.patch, glibc-isinf-cxx11.patch
  and glibc-rh1114591.patch since they are all upstream.
2016-02-25 15:48:36 -05:00
Florian Weimer
7dc8bfc342 Auto-sync with upstream master. 2016-02-13 13:27:45 +01:00
Florian Weimer
b2bf60e825 Auto-sync with upstream master. 2016-02-02 12:19:16 +01:00
Florian Weimer
05ffab72b4 Auto-sync with upstream master. 2016-01-28 11:54:08 +01:00
Florian Weimer
832f52f3cc Auto-sync with upstream master. 2015-12-21 17:31:12 +01:00
Florian Weimer
b79a5ba9e6 Auto-sync with upstream master.
This includes a fix for rhbz#1281714.
Manually remove the Unicode 8.0 patches, which have been merged upstream.
2015-12-16 14:00:32 +01:00
Florian Weimer
e0ca9a36a5 Auto-sync with upstream master. 2015-12-05 15:53:14 +01:00
Florian Weimer
2e15a6b6a7 Auto-sync with upstream master. 2015-11-20 10:08:34 +01:00
Florian Weimer
43aaa98743 Auto-sync with upstream master. 2015-11-18 13:30:53 +01:00
Florian Weimer
209b489bc2 Auto-sync with upstream master. 2015-11-16 21:40:35 +01:00
Florian Weimer
c6ef02b1b4 Auto-sync with upstream master. 2015-11-09 13:15:50 +01:00
Florian Weimer
4cc081474c Auto-sync with upstream master. 2015-10-30 19:26:52 +01:00
Carlos O'Donell
f768365ef5 Sync with upstream master. 2015-10-21 22:28:24 -04:00
Carlos O'Donell
e61b8f41f2 Sync with upstream master. 2015-10-21 15:24:28 -04:00
Carlos O'Donell
444c2ecfbc Auto-sync with upstream master. 2015-08-28 17:03:18 -04:00
Siddhesh Poyarekar
ac22d64886 Auto-sync with upstream master. 2015-08-16 09:51:12 +05:30
Siddhesh Poyarekar
daa5a48a9b Sync with upstream master 2015-08-14 12:30:00 +05:30
Siddhesh Poyarekar
6223dbf32d Sync with upstream master
- glibc-bench-compare.patch: Merged upstream
- glibc-rh757881.patch: Fixed differently upstream
- glibc-revert-arena-threshold-fix.patch: Additional fixes on top of this
- glibc-rh841787.patch: Fixed differently upstream
- Set MODULE_NAME=librt for rtkaio
- Fix up glibc-rh741105.patch to continue to work with latest master
2015-07-28 08:17:23 +05:30
Siddhesh Poyarekar
7047693f55 Sync with upstream master 2015-05-18 12:21:44 +05:30
Siddhesh Poyarekar
adbfe47d74 Auto-sync with upstream master. 2015-05-07 12:10:16 +05:30
Siddhesh Poyarekar
943a064b90 Revert "Auto-sync with upstream master." to work around 1209451
This reverts commit 3d147acd8d.
2015-04-07 21:02:28 +05:30
Siddhesh Poyarekar
3d147acd8d Auto-sync with upstream master. 2015-04-06 16:00:41 +05:30
Siddhesh Poyarekar
85b542148e Auto-sync with upstream master. 2015-03-24 18:04:53 +05:30
Siddhesh Poyarekar
ca47b31b17 Auto-sync with upstream master. 2015-03-12 15:43:36 +05:30
Siddhesh Poyarekar
5c979090d8 Auto-sync with upstream master. 2015-02-23 14:20:15 +05:30
Carlos O'Donell
c6d44c9902 Auto-sync with upstream master. 2015-02-12 00:29:07 -05:00
Siddhesh Poyarekar
5d3d5d4542 Sync with upstream master and disable Werror on s390x 2015-01-21 20:18:21 +05:30
Siddhesh Poyarekar
6105e83f88 Sync with upstream master.
- Disable -Werror on powerpc and armv7hl.
- Temporarily disable valgrind test on ppc64.
2015-01-07 19:03:06 +05:30
Carlos O'Donell
66b39fa433 Auto-sync with upstream master. 2014-11-28 21:32:05 -05:00
Carlos O'Donell
ce126e12db Sync with upstream master. 2014-11-24 09:58:08 -05:00
Siddhesh Poyarekar
5c361d9107 Sync with upstream master 2014-11-05 16:06:52 +05:30
Siddhesh Poyarekar
a391f0c0e6 Sync with upstream master 2014-09-30 22:14:50 +05:30
Siddhesh Poyarekar
a5b5c3d586 Sync with upstream master 2014-09-23 22:58:21 +05:30
Siddhesh Poyarekar
a9e37d2889 Actually upload sources 2014-09-17 22:17:15 +05:30
Siddhesh Poyarekar
680bff1439 Sync with upstream master 2014-09-08 12:32:01 +05:30