Merge branch 'master' into 'search_update'

# Conflicts:
#   setup.py
3 jobs for search_update in 13 seconds (queued for 8 minutes and 40 seconds)
Status Name Job ID Coverage
  Test
passed docs build #1408
memopol

00:00:01

failed qa checks #1407
memopol

00:00:04

failed unit tests #1406
memopol

00:00:07

 
Name Stage Failure
failed
qa checks Test There is an unknown failure, please try again
----------------------------------------
Cleaning up...
Command python setup.py egg_info failed with error code 1 in /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol
Storing debug log for failure in /home/gitlab-runner/.pip/pip.log

qa installed: argparse==1.2.1,wsgiref==0.1.2
___________________________________ summary ____________________________________
ERROR: qa: InvocationError: /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol/.tox/qa/bin/pip install -e /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol (see /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol/.tox/qa/log/qa-1.log)
ERROR: Job failed: exit status 1
failed
unit tests Test There is an unknown failure, please try again
----------------------------------------
Cleaning up...
Command python setup.py egg_info failed with error code 1 in /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol
Storing debug log for failure in /home/gitlab-runner/.pip/pip.log

py27 installed: argparse==1.2.1,wsgiref==0.1.2
___________________________________ summary ____________________________________
ERROR: py27: InvocationError: /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol/.tox/py27/bin/pip install -e /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol (see /home/gitlab-runner/builds/8361f2f7/0/memopol/memopol/.tox/py27/log/py27-1.log)
ERROR: Job failed: exit status 1