Commit graph

1100 commits

Author SHA1 Message Date
wheatdog
208edec09a ttf-envy-code-r: init at preview7 2017-07-08 15:28:57 +08:00
Johannes Frankenau
565e2b571b iosevka: 1.13.0 -> 1.13.1 2017-07-06 17:13:12 +02:00
bugworm
8acde59fa5 papirus-icon-theme: init at 20170616
fixes #27115
2017-07-04 17:46:04 +01:00
tjikini
c4d59d886d emacs-all-the-icons-fonts: 2.50 -> 2.6.4 2017-07-01 11:28:01 +03:00
Joachim F
e0528c2f86 Merge pull request #26928 from romildo/new.monoid
monoid: init at 2016-07-21
2017-06-30 15:48:47 +01:00
romildo
226aadd6b0 monoid: init at 2016-07-21 2017-06-28 23:24:32 -03:00
romildo
aad03268cb moka-icon-theme: 2017-02-13 -> 5.3.6 2017-06-27 22:52:00 -03:00
Lancelot SIX
95c98b9bf5
unifont: 9.0.06 -> 10.0.01
See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00009.html
for release information
2017-06-22 09:03:23 +02:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
volth
13a8fa8801 nixos-artwork: do not leak nix hashes to filenames in /share/artwork/gnome/ (#26566)
* nixos-artwork: do not leak nix hashes to filenames /share/artwork/gnome/

* simplify
2017-06-14 17:46:13 +02:00
Joachim F
631ec734eb Merge pull request #26460 from romildo/fix.nixos-artwork
nixos-artwork: add more wallpapers
2017-06-13 23:20:52 +01:00
Jörg Thalheim
b731e65081 arphic: init at 0.2.20080216.2
arphic: init at 0.2.20080216.2
2017-06-10 09:32:34 +01:00
Jörg Thalheim
6e604ec68c
arphic: style fixes 2017-06-10 09:31:20 +01:00
Changlin Li
8237294f64 Add Unicode Arphic CJK fonts
These are a couple of CJK fonts that are on most other Linux distributions
that aren't on NixOS
2017-06-09 20:52:18 -04:00
Masayuki Takeda
c2c775d047 rictydiminished-with-firacode: init at 0.0.1 (#26485) 2017-06-10 00:29:36 +01:00
romildo
aa8018103c nixos-artwork: add more wallpapers
Restructure the nixos-artwork to make it easy to selectively
incorporate other components from upstream without needing to download
the full package.

Until now only the Gnome_Dark wallpaper was included. Add other
wallpapers available in the package repository.
2017-06-07 18:00:58 -03:00
Winnie Quinn
f5edcbde8f iosevka: 1.12.5 -> 1.13.0 2017-06-03 19:04:40 -04:00
Shea Levy
4e32f5bda3 docbook-xsl: Install dbtoepub 2017-06-03 09:37:36 -04:00
Franz Pletz
45372b1cdc
geolite-legacy: 2016-07-08 -> 2017-05-26 2017-05-26 13:09:45 +02:00
armijnhemel
ffb5eb3087 font-droid: cleanup homepage metadata (#26101) 2017-05-26 01:30:17 +02:00
Peter Simons
cb838cad5c all-cabal-hashes: update to latest version of Hackage 2017-05-23 10:38:12 +02:00
romildo
58c17c75ba elementary-icon-theme: 4.0.3 -> 4.1.0 2017-05-19 20:48:31 -03:00
Joachim F
32033f5bf3 Merge pull request #25848 from lufia/update-gofont
go-font: 2016-11-17 -> 2017-03-30
2017-05-18 21:26:50 +01:00
Thomas Tuegel
4fd23d7346
fontconfig-penultimate: 0.3.4 -> 0.3.5
The NixOS option `useEmbeddedBitmaps` is now correctly respected.
2017-05-17 07:23:57 -05:00
lufia
e131edf04b go-font: 2016-11-17 -> 2017-03-30 2017-05-17 15:00:22 +09:00
Profpatsch
685bfcee63 fira-code-symbols: init at 20160811 2017-05-16 13:50:31 +02:00
Jörg Thalheim
f016fa3ce3
iana-etc: 20170417 -> 20170512 2017-05-13 07:21:06 +01:00
Thomas Tuegel
c9f8fb4d12
fontconfig-penultimate: 0.3.3 -> 0.3.4 2017-05-12 11:15:00 -05:00
Balletie
0157ffe0a3
emojione: Fix typo in meta.license attribute name
When installing this package, it broke because there was no
meta.license attribute.
2017-05-10 21:25:26 +02:00
rht
c3bbc8adea inconsolata-lgc: git-2015-04-18 -> 1.3 (#25641)
* inconsolata-lgc: git-2015-04-18 -> 1.3

* lgc.nix: fix evaluation
2017-05-09 16:05:01 +01:00
Eelco Dolstra
b7ed6ef9e1
man-pages: 4.09 -> 4.11 2017-05-04 15:56:06 +02:00
Richard Lupton
69ed7f6e12
emacs-all-the-icons-fonts: init at 2.5.0 2017-04-22 18:54:51 +01:00
Jörg Thalheim
024cbbd520
iana-etc: 20170328 -> 20170417 2017-04-19 08:29:31 +02:00
Jörg Thalheim
f27206c952 Merge pull request #24993 from romildo/upd.elementary-icon-theme
elementary-icon-theme: 4.0.1.1 -> 4.0.3
2017-04-18 22:09:15 +02:00
romildo
71af44cae9 elementary-icon-theme: 4.0.1.1 -> 4.0.3 2017-04-18 06:49:25 -03:00
Hamish Mackenzie
89b89d1071 defaultIconTheme: Enable darwin support 2017-04-18 09:43:03 +12:00
Winnie Quinn
1ff676526c iosevka: 1.12.1 -> 1.12.5 2017-04-16 13:22:56 -04:00
Robert Helgesson
45cb7c2c0e
comic-relief: change download URL
The previous URL is broken.
2017-04-15 12:04:37 +02:00
Sean Haugh
c919ceda06 envypn-font: init at 1.7.1 2017-04-12 17:14:26 -05:00
Thomas Tuegel
a40600bc58
fontconfig-penultimate: 0.3.2 -> 0.3.3 2017-04-08 09:42:09 -05:00
Tim Steinbach
4984e7e053 Merge pull request #24624 from taku0/source-han-serif
add Source Han Serif font
2017-04-06 13:48:00 -04:00
taku0
2994f14edb add source-han-serif-japanese, source-han-serif-korean, source-han-serif-simplified-chinese, source-han-serif-traditional-chinese: An open source Pan-CJK serif typeface 2017-04-06 21:57:13 +09:00
taku0
84ffb2d1d5 source-han-sans: fix license from ASL2.0 to SIL Open Font License. 2017-04-05 22:52:16 +09:00
zimbatm
1bf690c1bb iosevka: 1.11.4 -> 1.12.1 (#24527)
iosevka: 1.11.4 -> 1.12.1
2017-04-03 18:30:49 +01:00
Thomas Tuegel
89bfa112cf
fontconfig-penultimate: 0.2.1 -> 0.3.2 2017-04-03 09:26:19 -05:00
Michael Raskin
7a46312f1c xorg-rgb: init at 1.0.6 2017-03-30 22:55:26 +02:00
Robin Gloster
d7f3e5a8f0
rXrs: mark as broken (X ∈ {3, 4, 5}) 2017-03-30 12:06:15 +02:00
Jörg Thalheim
50527dbd0e
iana-etc: 2.30 -> 20170328 2017-03-28 22:35:15 +02:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Michael Raskin
bee5916d22 Merge pull request #24364 from sternenseemann/shrikhand
shrikhand: init 2016-03-03
2017-03-26 22:20:34 +02:00
sternenseemann
829b68844a shrikhand: init 2016-03-03 2017-03-26 22:15:16 +02:00
Vladimír Čunát
c1a9dc3d37
Merge branch 'master' into staging 2017-03-23 13:31:28 +01:00
Volth
a7732d6f54 babelstone-han: init at 9.0.2 2017-03-21 19:11:08 +01:00
Thomas Tuegel
7299db431a
fontconfig-penultimate: 0.2 -> 0.2.1
Added package metadata, including license.
2017-03-21 11:22:45 -05:00
Thomas Tuegel
1b0d9e9ae6 Merge pull request #23819 from ttuegel/freetype
FreeType 2.7.1 and Fontconfig defaults
2017-03-20 11:43:50 -05:00
Winnie Quinn
7dccfd49aa iosevka: 1.4.2 -> 1.11.4
1.11.4 contains numerous improvements including ligatures and fixes to
font weights.

I switched "default.nix" from using `fetchFromGitHub` to simply pulling
down the release as a zip via `fetchurl`. This seems like the best
approach given that the repositoriy no longer contains font files and
the alternative would be to build them from scratch.
2017-03-18 17:40:38 -04:00
Thomas Tuegel
354ea69ae4
fontconfig-penultimate: init at 0.2
Also provides a NixOS module.
2017-03-17 13:50:05 -05:00
Benjamin Staffin
c2b0cb5db6 nixos: nix snowflake logo for the nixos manual launcher 2017-03-16 17:48:09 -04:00
Leon Isenberg
1971e94d48 hasklig: 0.9 -> 1.1 2017-03-05 15:32:30 +01:00
Renaud
56a4640b0c iana-etc: fixed source URL and homepage (#23167)
The homepage has moved years ago.
2017-02-25 13:58:32 +01:00
Joachim F
859f00a6c2 Merge pull request #23145 from romildo/upd.paper-icon-theme
paper-icon-theme: 2016-11-05 -> 2017-02-13
2017-02-24 18:50:36 +01:00
Joachim F
2b5b14fd9b Merge pull request #23139 from romildo/upd.moka-icon-theme
moka-icon-theme: 2016-10-06 -> 2017-02-13
2017-02-24 17:51:12 +01:00
romildo
08749dd231 paper-icon-theme: 2016-11-05 -> 2017-02-13 2017-02-24 06:57:19 -03:00
romildo
aaa93d32aa numix-icon-theme: 2016-11-13 -> 2017-01-25 2017-02-24 06:37:46 -03:00
romildo
e4ab4a733c moka-icon-theme: 2016-10-06 -> 2017-02-13 2017-02-24 06:10:52 -03:00
Robert Helgesson
b87be6e8ec
stix-two: init at 2.0.0 2017-02-20 23:55:55 +01:00
Peter Simons
34584b2c3c hackage: update snapshot to 2017-02-12T15:49:03Z 2017-02-16 11:48:10 +01:00
Vladimír Čunát
6bea415b5e
Merge branch 'master' into staging 2017-02-09 08:42:04 +01:00
Frederik Rietdijk
b469952348 liberation_ttf_from_source: use python2 2017-02-08 19:41:22 +01:00
volth
9e299acf87 liberastika: init at 1.1.5 (#22420) 2017-02-04 16:38:01 +01:00
Volth
6a5ee48724 liberation-fonts: init at 1.07.4 2017-02-03 22:04:35 +00:00
Peter Simons
3b26c2f465 callHackage: update Hackage snapshot to a current version 2017-01-31 22:50:18 +01:00
Damien Cassou
58dc8e3024
Remove myself from maintainers 2017-01-31 11:00:14 +01:00
Lorenzo Manacorda
0ecde73b91 siji: init at 2016-05-14 2017-01-30 11:32:52 +01:00
Franz Pletz
b72b6a3160
gentium: fix source url 2017-01-26 03:52:49 +01:00
Robert Helgesson
4a914f2f9f
overpass: 2.1 -> 3.0.2 2017-01-24 23:15:15 +01:00
romildo
58a5a32dc9 roboto: 2.135 -> 2.136 2017-01-23 19:37:13 -02:00
Alexander Batischev
733365b22f paratype-pt-sane: s/sane/sans/ 2017-01-22 15:20:14 +03:00
Vladimír Čunát
cb6f49a61f
man-pages: 4.08 -> 4.09
Includes about a dozen new pages.
2017-01-12 19:16:54 +01:00
Peter Simons
b4fcbf4095 callHackage: update database to current version 2017-01-12 10:00:22 +01:00
mimadrid
c2d90eaa91 nerdfonts: 0.8.0 -> 1.0.0 2016-12-29 11:21:57 +01:00
Vladimír Čunát
5ac7da9376
tzdata: 2016f -> 2016j 2016-12-28 19:15:18 +01:00
Lancelot SIX
bc4a671980
unifont: 9.0.04 -> 9.0.06
See https://lists.gnu.org/archive/html/info-gnu/2016-12/msg00014.html
for release information
2016-12-24 22:28:32 +01:00
Michael Raskin
fd2ff58d16 unscii: init at 1.1 2016-12-15 21:29:13 +01:00
Jörg Thalheim
067171a61f man-pages: fix conflict with shadow-utils 2016-12-15 12:05:52 +01:00
romildo
e9a5680eb7 roboto: 2.134 -> 2.135 2016-12-09 10:16:17 -02:00
José Romildo Malaquias
5e73d5d8ab numix-icon-theme-square: init at 2016-11-23 (#20988)
Travis reports hash mismatch during the darwin build, although the hash has been obtained using 'nix-prefetch-url' (on NixOS). Exclude darwin from platforms until the cause is identified.
2016-12-08 16:07:53 +01:00
Joachim F
bd190af963 Merge pull request #20983 from romildo/upd.paper-icon-theme
paper-icon-theme: 2016-06-08 -> 2016-11-05
2016-12-08 11:32:08 +01:00
Joachim F
1a686fe427 Merge pull request #20985 from romildo/upd.elementary-icon-theme
elementary-icon-theme: 4.0.1 -> 4.0.1.1
2016-12-08 11:30:31 +01:00
Joachim F
6a38ea4bd6 Merge pull request #20982 from romildo/upd.arc-icon-theme
arc-icon-theme: 2016-07-07 -> 2016-11-22
2016-12-08 11:29:49 +01:00
romildo
979a1a1043 numix-icon-theme: 2016-10-05 -> 2016-11-13 2016-12-07 18:33:28 -02:00
romildo
dd5eb0d03a elementary-icon-theme: 4.0.1 -> 4.0.1.1 2016-12-07 17:56:14 -02:00
romildo
1494ede691 paper-icon-theme: 2016-06-08 -> 2016-11-05 2016-12-07 17:27:42 -02:00
romildo
a634fe83a3 arc-icon-theme: 2016-07-07 -> 2016-11-22 2016-12-07 17:10:45 -02:00
romildo
629b979227 adapta-backgrounds: init at 0.4.0.6 2016-12-02 23:01:23 -02:00
goibhniu
304150f576 Merge pull request #20743 from Okasu/terminus-font-ttf
terminus-font-ttf: init at 4.40.1
2016-12-01 14:07:40 +01:00
Okasu
de925e952e terminus-font-ttf: init at 4.40.1 2016-11-28 10:54:33 +03:00
Nikolay Amiantov
a5f972fa73 xits-math: build from source 2016-11-24 01:17:54 +03:00
Nikolay Amiantov
be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
sternenseemann
04c6e3b115 go-font: init at 2016-11-17 2016-11-21 17:05:25 +01:00
Robert Helgesson
72d410fc74
pecita: 5.3 -> 5.4 2016-11-17 00:06:41 +01:00
Eelco Dolstra
2c2b6ae455 google-fonts: Add a check to ensure that there are no duplicate font names
Issue #20282.
2016-11-14 17:35:35 +01:00
Jascha Geerds
13fbc6ccd1 numix-icon-theme-circle: 2016-09-27 -> 2016-11-10 2016-11-11 11:25:16 +01:00
Robert Helgesson
04d30023cf
fira-code: 1.203 -> 1.204 2016-11-09 16:32:40 +01:00
Eelco Dolstra
bbb5f73d71 man-pages: 4.07 -> 4.08 2016-11-08 14:58:34 +01:00
Robert Helgesson
321e2a9153
unifont: 9.0.03 -> 9.0.04
Also change download URL to use GNU mirrors.
2016-11-05 07:56:16 +01:00
Christian Lask
2d524a37f8 Remove myself as maintainer. 2016-11-03 11:54:54 +01:00
Peter Simons
fac1168816 callHackage: make 'all-cabal-hashes' repository overridable
This commit changes callHackage to use a deterministic version of the Hackage
checkout from https://github.com/commercialhaskell/all-cabal-hashes by default.
This means that packages uploaded to Hackage after today will be available to
callHackage only after "pkgs/data/misc/hackage/default.nix" has been updated.

People who want the previous behavior where we always had the latest version of
Hackage available -- at the cost of frequent downloads from Github --, can add
the following override to their "~/.nixpkgs/config.nix" file:

  {
    packageOverrides = super: {
      all-cabal-hashes = builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz";
    };
  }
2016-11-01 18:35:19 +01:00
Tim Steinbach
ed29ab2984
font-awesome: 4.6.3 -> 4.7.0 2016-10-29 16:37:09 -04:00
c74d
44b932316b google-fonts: Fix typos in homepage, description
In the `meta`data for the `google-fonts` package --

  - the `homepage` field was set to the URL
    <https://www.google.com/fontsl>, which would appear to be a
    misspelt version of <https://www.google.com/fonts>, which now
    redirects to <https://fonts.google.com>.

  - the `description` field referred to Google Fonts as "Google Font".

This patch corrects these errors, and updates the `homepage` URL.
2016-10-29 19:59:59 +00:00
José Romildo Malaquias
b1d3998015 mplus-outline-fonts: 061 -> 062 (#19948) 2016-10-29 05:37:18 +02:00
Tim Steinbach
be32a53097 Merge pull request #19845 from NeQuissimus/unifont_9_0_03
unifont: 9.0.02 -> 9.0.03
2016-10-25 11:48:27 -04:00
Tim Steinbach
c7917c5a45
unifont_upper: 9.0.01 -> 9.0.03 2016-10-24 22:42:52 -04:00
Tim Steinbach
d51f1a3dd3
unifont: 9.0.02 -> 9.0.03 2016-10-24 22:42:01 -04:00
Tim Steinbach
6adde2a5d9 Merge pull request #19712 from peterhoeg/fontawesome-cleanup
font-awesome: use fetchFromGitHub instead of url
2016-10-20 09:46:50 -04:00
Danny Arnold
4acfe25dd5 zeal: 0.3.0 -> 0.3.1 2016-10-20 10:41:04 +02:00
Jörg Thalheim
209691e397 Merge pull request #19688 from Profpatsch/league-of-moveable-type
league-of-moveable-type: fix raleway integration
2016-10-20 10:17:22 +02:00
Peter Hoeg
8c87ca1327 font-awesome: use fetchFromGitHub instead of url 2016-10-20 12:59:20 +08:00
Profpatsch
d1c2341c89 league-of-moveable-type: fix raleway integration
The raleway fonts need to be copied from their /share folder to be
included properly.
They are also `.otf`-fonts, so they should live in `opentype` folders.
2016-10-20 01:16:29 +02:00
Graham Christensen
33ac1e1d63
raleway: fix meta.homepage 2016-10-16 13:10:41 -04:00
Jörg Thalheim
f175831407 Merge pull request #19573 from Profpatsch/league-of-moveable-type
League of moveable type update & raleway
2016-10-15 11:25:35 +02:00
Profpatsch
fc19902260 league-of-movable-type: 2014-12 -> 2016-10-15
Restructured, so that updates can be done by executing a shell script.
Also uses the extended Raleway fonts, the league itself has only thin
variants.
2016-10-15 06:49:50 +02:00
Profpatsch
a1d3af2082 raleway: init at 2016-08-30 2016-10-15 06:49:38 +02:00
Joachim F
c719a4c434 Merge pull request #19552 from romildo/upd.elementary-icon-theme
elementary-icon-theme: 3.2.2 -> 4.0.1
2016-10-14 23:31:50 +02:00
Robert Helgesson
2398a66859
overpass: init at 2.1 2016-10-14 23:07:04 +02:00
romildo
4e4205469b elementary-icon-theme: 3.2.2 -> 4.0.1 2016-10-14 14:48:50 -03:00
Tim Steinbach
24f86ac41a Merge pull request #19546 from romildo/upd.faba-icon-theme
faba-icon-theme: 2016-06-02 -> 2016-09-13
2016-10-14 09:26:52 -04:00
Tim Steinbach
03805c42a3 Merge pull request #19547 from romildo/upd.moka-icon-theme
moka-icon-theme: 2016-06-07 -> 2016-10-06
2016-10-14 09:26:41 -04:00
Tim Steinbach
9aa06ba95a Merge pull request #19548 from romildo/upd.faba-mono-icons
faba-mono-icons: fix repository name
2016-10-14 09:26:21 -04:00
Tim Steinbach
3beb90cf72 Merge pull request #19549 from romildo/upd.arc-icon-theme
arc-icon-theme: 2016-06-06 -> 2016-07-07
2016-10-14 09:25:51 -04:00
romildo
2817e73568 arc-icon-theme: 2016-06-06 -> 2016-07-07 2016-10-14 07:57:29 -03:00
romildo
2f5150be7a faba-mono-icons: fix repository owner 2016-10-14 07:42:26 -03:00
romildo
33acea23b4 moka-icon-theme: 2016-06-07 -> 2016-10-06 2016-10-14 07:33:23 -03:00
romildo
ebcd7f2a63 faba-icon-theme: 2016-06-02 -> 2016-09-13 2016-10-14 07:10:52 -03:00
Vladimír Čunát
727fc259d6 Merge branch 'master' into staging 2016-10-13 09:53:16 +02:00
Jascha Geerds
44bb5caf7d numix-icon-theme-circle: 2016-06-10 -> 2016-09-27 2016-10-11 23:33:42 +02:00
Jascha Geerds
d36268c47d numix-icon-theme: 2016-06-10 -> 2016-10-05 2016-10-11 23:33:42 +02:00
Profpatsch
bef6bef0d2
stdenv/stripHash: print to stdout, not to variable
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.

Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
2016-10-11 18:34:36 +02:00
romildo
658e216cc6 maia-icon-theme: -> 2016-09-16
Add versioning using the date of revision on the git repository. Also
update to the latest revision, which includes a dark version of the icon
theme.

The cmake scripts install the icons at subdirectories 'maia' and
'maia-dark'. Also use these names. The difference is in the
capitalization of the names.
2016-10-09 10:27:24 -03:00
Robin Gloster
30accf4d3e
treewide: fix licence -> license occurences 2016-10-09 12:45:32 +02:00
Jörg Thalheim
6c3b4d3a14 Merge pull request #19378 from romildo/fix.input-fonts
input-fonts: fix license
2016-10-09 09:52:22 +02:00
romildo
a50e919950 input-fonts: fix license 2016-10-09 00:01:34 -03:00
Franz Pletz
0d59fc1169
cacerts: refactor, add blacklist option
Previously, the list of CA certificates was generated with a perl script
which is included in curl. As this script is not very flexible, this commit
refactors the expression to use the python script that Debian uses to
generate their CA certificates from Mozilla's trust store in NSS.

Additionally, an option was added to the cacerts derivation and the
`security.pki` module to blacklist specific CAs.
2016-10-09 02:00:18 +02:00
José Romildo Malaquias
2763d4d4c7 input-fonts: init at 2016-10-06 (#19080) 2016-10-08 16:00:08 +02:00
Joachim F
7425ce511d Merge pull request #19282 from peterhoeg/zeal
zeal: 0.2.1 -> 0.3.0
2016-10-07 12:28:00 +02:00
Gabriel Adomnicai
18d7e2ac33 camingo-code: init at 1.0 2016-10-06 17:47:50 -07:00
Thomas Tuegel
2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Periklis Tsirakidis
8a9bd3d3dd stdman: enable build for darwin 2016-10-06 10:23:15 +02:00
Peter Hoeg
127a04f4ee zeal: 0.2.1 -> 0.3.0
This new version fixes #8008 which despite the issue being closed was
still a problem.

We now compile it with the default qt5 which as of today is 5.6.1
instead of forcing 5.5.
2016-10-06 13:11:26 +08:00
Tuomas Tynkkynen
19225bf5cc Merge remote-tracking branch 'upstream/master' into staging 2016-10-02 10:36:47 +03:00