Merge pull request #1032 from acaldero/master

2.4.0: minor updates on testing

2.3.8: minor updates

2.3.7: minor update

2.3.6: minor update

Merge pull request #902 from acaldero/master

2.3.5: minor update on firm_fields_v1

2.3.3: minor updates

2.3.2: minor updates

Merge branch '2.3.1'

2.3.0: minor updates

Merge branch 'acaldero-2.2.2' into 2.2.2