11.0 modifications

Merged Gastón Bertolani requested to merge 11.0-modifications into 11.0-stage
  1. Nov 22, 2018
  2. Nov 20, 2018