Merge of master & lvm/3.3.x