Commit graph

819 commits

Author SHA1 Message Date
Ian
36933ec18c
Add Freetrade.io 2019-03-04 09:47:51 +00:00
Jesus Sanchez
eec6f12c68 Add TransferWise 2019-03-04 10:04:36 +01:00
Maximilian Braun
705d06e598
Merge branch 'master' into patch-1 2019-03-04 08:30:15 +01:00
bors[bot]
19fba28c52 Merge #746
746: Add flatfox.ch r=poteto a=nuschk

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: Bernhard Mäder <bernhard.maeder@gmail.com>
2019-03-04 07:29:38 +00:00
Maximilian Braun
e3361cd483
Update README.md
fix order
2019-03-04 08:28:19 +01:00
Bernhard Mäder
6ac331038a Removed trailing slash 2019-03-04 08:14:57 +01:00
Bernhard Mäder
df463aa77e Added flatfox.ch 2019-03-04 08:09:08 +01:00
bors[bot]
7068bd3513 Merge #745
745: Add Shogun r=poteto a=robertn702

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: Robert Niimi <robertn702@gmail.com>
2019-03-04 06:54:58 +00:00
bors[bot]
c6d495867d Merge #744
744: Add Pex r=poteto a=ehmo

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: ehmo <ehmo@users.noreply.github.com>
2019-03-04 06:53:24 +00:00
Robert Niimi
8b046867d2
Add Shogun 2019-03-04 13:47:49 +08:00
ehmo
4a396a345b add pex 2019-03-03 20:03:11 -08:00
bors[bot]
17e9beb249 Merge #735
735: add Kata.ai r=poteto a=adityapurwa

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add Kata.ai

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [x] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->

Kata.ai interview process is by selecting the incoming application and set up a take-home assignment appropriate for the applied position. Some position might not require a take-home assignment and only involves discussion during the interview. After the take-home assignment, we will invite the applicant to discuss their assignment and do an interview with them.

Co-authored-by: Aditya Purwa <adityapurwa@windowslive.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 02:00:21 +00:00
Lauren Tan
61e292b6bd
Merge branch 'master' into master 2019-03-03 17:59:48 -08:00
Aditya Purwa
c23a2297a0
make entry single line 2019-03-04 08:57:21 +07:00
bors[bot]
b3fb4a3acc Merge #743
743: Update deps & add trailing space linter r=poteto a=poteto

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [ ] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [ ] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [ ] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->

Co-authored-by: Lauren Tan <laurent@netflix.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 01:03:05 +00:00
Lauren Tan
866936dcdf
Merge branch 'master' into update-deps 2019-03-03 17:02:31 -08:00
Lauren Tan
53c3de0996 Update travis.yml node version 2019-03-03 17:00:43 -08:00
Lauren Tan
fafc7c22a6 Lint trailing spaces 2019-03-03 16:59:20 -08:00
Lauren Tan
7c74f7bad5 Update deps & node version 2019-03-03 16:57:26 -08:00
bors[bot]
dc673f1a59 Merge #711
711: fixed exercises r=poteto a=0xflotus

I only fixed two small typos

Co-authored-by: 0xflotus <0xflotus@gmail.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:55:49 +00:00
Lauren Tan
db47d149bc
Merge branch 'master' into patch-1 2019-03-03 16:54:26 -08:00
bors[bot]
f301ca850e Merge #518
518: Rewrote a few sentences in README r=poteto a=ho-ian

This isn't a contribution to the list of companies or teams. I edited some of your sentences in the README where they could be changed.

Co-authored-by: Ian Ho <ho.ian96@gmail.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:54:21 +00:00
Lauren Tan
11685c5182
Merge branch 'master' into master 2019-03-03 16:53:30 -08:00
bors[bot]
5d10694a39 Merge #623
623: Gitlab filters with trivia and puzzles r=poteto a=onelesanchez

First step in their hiring pipeline for technical roles includes answering the what-happens-when question and implementing a sort and search algorithm.

This is done over email and time boxed to 10 days.

Co-authored-by: onelesanchez <37211311+onelesanchez@users.noreply.github.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:52:52 +00:00
Lauren Tan
a41121face
Update README.md 2019-03-03 16:52:23 -08:00
Lauren Tan
cd486288da
Merge branch 'master' into gitlab-does-cs-trivia-as-first-filter 2019-03-03 16:51:44 -08:00
bors[bot]
10b9a202ed Merge #651 #668
651: Remove DigitalOcean r=poteto a=danellis

## Remove DigitalOcean

- [X] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [X] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [X] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [X] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

While they do give a take-home test, they also do multiple whiteboard interviews during the on-site. For example, "write a function to find all the words in a Boggle square" and "write a function to check for overlapping events on a calendar".


668: Remove Ada r=poteto a=coaxial

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->


- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [x] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->
Ada does filter with whiteboarding: candidates are asked to code in a
google docs solutions to abstract algorithms that are unlikely to represent
typical work (for example: write a recursive function that multiplies
two negative numbers together without using the multiply operation)

Co-authored-by: Dan Ellis <dan@reactivedynamics.io>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
Co-authored-by: coaxial <hi@64b.it>
Co-authored-by: Pierre <coaxial@users.noreply.github.com>
2019-03-04 00:51:18 +00:00
Lauren Tan
c31075537d
Merge branch 'master' into master 2019-03-03 16:50:50 -08:00
bors[bot]
c287be36a5 Merge #684 #689
684: Remove DataCentred as they no longer exist r=poteto a=glitchcrab

## Remove DataCentred

This PR removes DataCentred as they are sadly no longer trading:

https://www.datacenterdynamics.com/news/datacentred-is-shutting-down-after-losing-hmrc-as-a-customer/

689: Added MakeMusic r=poteto a=trpalmer

## Add MakeMusic

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary


Co-authored-by: Simon Weald <simon@simonweald.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
Co-authored-by: Todd Palmer <tpalmer@trainingpeaks.com>
2019-03-04 00:49:47 +00:00
Lauren Tan
03e3caf0f7
Merge branch 'master' into ada 2019-03-03 16:49:45 -08:00
Lauren Tan
c18ea7665c
Merge branch 'master' into remove-datacentred 2019-03-03 16:49:10 -08:00
Lauren Tan
be3380a35b
Merge branch 'master' into makemusic 2019-03-03 16:48:28 -08:00
bors[bot]
b57f23e2c4 Merge #712
712: Updating a market merge r=poteto a=lfigaro

VivaReal no longer exists since it merges with its main competitor, Zap imóveis, creating Grupo ZAP (ZAP Group).

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Update <VivaReal (now 'ZAP Group')>

- [X] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [X] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [X] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->

Co-authored-by: Figaro <luis.figaro@gmail.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:48:08 +00:00
Lauren Tan
4827ab6722
Merge branch 'master' into patch-1 2019-03-03 16:47:32 -08:00
bors[bot]
db792fa282 Merge #733
733: README.md: Removed Final (got acquired) r=poteto a=elimisteve

## Remove Final

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

Co-authored-by: Steve Phillips <steve@tryingtobeawesome.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:46:37 +00:00
Lauren Tan
e85a564289
Merge branch 'master' into patch-1 2019-03-03 16:46:19 -08:00
bors[bot]
e9187f15ae Merge #737 #738 #740
737: Added HoloBuilder r=poteto a=simon-heinen

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


738: Adding Rose Digital r=poteto a=evanmrose

## Add Rose Digital

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary


740: Add Railslove r=poteto a=timomeh

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add Railslove

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: Simon Heinen <simon@bitstars.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
Co-authored-by: Evan M Rose <evanmrose@gmail.com>
Co-authored-by: Timo Mämecke <timomeh@users.noreply.github.com>
2019-03-04 00:43:26 +00:00
Lauren Tan
b0aabe0132
Merge branch 'master' into patch-1 2019-03-03 16:41:50 -08:00
Lauren Tan
cd77c22f2b
Merge branch 'master' into rose-digital 2019-03-03 16:41:30 -08:00
Lauren Tan
c73d8f3f4a
Merge branch 'master' into master 2019-03-03 16:41:01 -08:00
bors[bot]
c3212a460f Merge #731
731: Add Samsara r=poteto a=oliversong

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: Oliver Song <oliver.song@samsara.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:40:07 +00:00
Lauren Tan
f6bebd2348
Merge branch 'master' into samsara 2019-03-03 16:39:34 -08:00
bors[bot]
5100d81992 Merge #729 #730
729: Add Busbud r=poteto a=OzoTek

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add Busbud

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

730: Add Elvie r=poteto a=simonhamp

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add Elvie

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [x] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->
At Elvie, we highly value our culture and it’s as important to us that you are a good fit in the wider team as well as being a top candidate for the relevant role. That’s why our developer hiring process is more about finding out how you think about solving problems than seeing how you go about solving specific challenges.

We’re pragmatic programmers who have a job to do. We don’t expect you to be able to write a binary parsing algorithm from scratch, but rather to understand that you have the right attitude towards that level of problem solving. We’ll then give the space and support you need to do your best work and learn as you go.

Co-authored-by: Alexandre Couret <alex.couret18@gmail.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
Co-authored-by: Simon Hamp <simon.hamp@me.com>
2019-03-04 00:37:13 +00:00
Lauren Tan
83b63020bb
Merge branch 'master' into samsara 2019-03-03 16:36:31 -08:00
Lauren Tan
7dc4902c3f
Merge branch 'master' into patch-1 2019-03-03 16:36:10 -08:00
Lauren Tan
3a84040845
Merge branch 'master' into patch-1 2019-03-03 16:35:44 -08:00
bors[bot]
7fc5c4d4ba Merge #728
728: Add Lob r=poteto a=dmlittle

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove <CompanyName>

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [x] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: Donald Little <donald@lob.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:35:34 +00:00
Lauren Tan
039b4dbab9
Merge branch 'master' into patch-1 2019-03-03 16:35:06 -08:00
bors[bot]
7e15495de6 Merge #706
706: Add Glints r=poteto a=yjwong

<!--
Thank you for contributing!

Pull requests that do not adhere to the format will be rejected. Please ensure
you complete the following checkboxes.

Please also:

- Add one company at a time.
- Insert in alphabetical order
- Do not sort other listings
-->

## Add/Update/Remove Glints

- [x] I have read the [contributing guidelines](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md)
- [x] I agree to the [Code of Conduct](https://github.com/poteto/hiring-without-whiteboards/blob/master/CODE_OF_CONDUCT.md)
- [x] I have followed the [format](https://github.com/poteto/hiring-without-whiteboards/blob/master/CONTRIBUTING.md#format) prescribed in the contributing guidelines
- [ ] (OPTIONAL) In your pull request message, add additional context on the interview process if necessary

<!--
Please give additional context about the interview process if necessary.
-->


Co-authored-by: Wong Yong Jie <yjwong92@gmail.com>
Co-authored-by: Lauren Tan <poteto@users.noreply.github.com>
2019-03-04 00:31:54 +00:00
Lauren Tan
04260ea824
Merge branch 'master' into master 2019-03-03 16:31:37 -08:00