#1046 Alltests on green
Merge remote-tracking branch 'chico.ml/v1.0' into v1.0
Merge pull request #1114 from llinares/v1.0

All tests in green