Progress?
Merge pull request #3078 from obrignoni/2.3/develop

Progress? Indeed.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop