Merge branch 'p1' into 'master'

Update FaceNet.py -- Add an example preprocessor

See merge request !2
15 jobs for master in 6 minutes and 23 seconds (queued for 8 seconds)
Status Job ID Name Coverage
  Build
passed #119305
conda-linux
build_linux_27

00:02:17

passed #119306
conda-linux
build_linux_35

00:01:56

passed #119307
conda-linux
build_linux_36

00:02:10

failed #119308
conda-macosx
build_macosx_27

failed #119309
conda-macosx
build_macosx_35

failed #119310
conda-macosx
build_macosx_36

 
  Test
skipped #119311
conda-linux
test_linux_27
skipped #119312
conda-linux
test_linux_35
skipped #119313
conda-linux
test_linux_36
skipped #119314
conda-macosx
test_macosx_27
skipped #119315
conda-macosx
test_macosx_35
skipped #119316
conda-macosx
test_macosx_36
 
  Docs
skipped #119317
conda-linux
docs_linux_35
 
  Wheels
skipped #119318
conda-linux
wheels_linux_27
skipped #119319
conda-linux
wheels_linux_35
 
Name Stage Failure
failed
build_macosx_36 Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
build_macosx_35 Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
build_macosx_27 Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log