[automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev
am: 12c90b57d3 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 25f1828778 is in history

Change-Id: Id859f70e1e7584d3640a43a041126b82b308d84e