Merge branch 'master' into scheduler

Conflicts:
	setup.py
3 jobs for scheduler in 36 minutes and 22 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #3296
lidiap2015
py27-linux

00:20:06

passed #3295
beat-macosx
py27-macosx

00:16:16

failed #3294
lidiap2015
py27-linux

00:10:48