[automerger skipped] Merge "Reinstate access to a forgotten member" into...
[automerger skipped] Merge "Reinstate access to a forgotten member" into qt-dev am: 12c90b57 -s ours
am: 133e0dc0 -s ours
am skip reason: change_id I6f6b2cf75793532d3d537a223b8e15d7304a1e3f with SHA1 25f18287 is in history
Change-Id: I3f5e3ff6c5a2515cbede4d1049fa017f592f93d9