Release/1.3.x

Backport aggregations and multi fields mapping from master (working on es 1.3.x).