Merge branch 'master' into bindings/python

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --cc formats/ctf/types/array.c
index 04801d4f05455df71160f85b4cd0ed6d58c9d180,b1e8d6c5af7b316110b31920a7a61ed125ac4c98..979f7a3dc313895d29085e6de09e7ad904b675c0
--- 1/formats/ctf/types/array.c
--- 2/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@@ -56,6 -57,9 +57,11 @@@ int ctf_array_read(struct bt_stream_po
                                g_string_insert_len(array_definition->string,
                                        0, (char *) ctf_get_pos_addr(pos),
                                        array_declaration->len);
 -                              if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
 -                                      return -EFAULT;
 -                              return 0;
++                              /*
++                               * We want to populate both the string
++                               * and the underlying values, so carry
++                               * on calling bt_array_rw().
++                               */
                        }
                }
        }

diff --cc formats/ctf/types/float.c
Simple merge

diff --cc formats/ctf/writer/event-fields.c
Simple merge

diff --cc lib/iterator.c
Simple merge