Interm Commit - Do Not Use
Merge remote-tracking branch 'origin/next' into qt_5.2
Merge remote-tracking branch 'origin/next' into qt_5.2
Replaced lifestuff references with client.
Merge remote-tracking branch 'origin/qt_5.2' into next
Merge branch 'next' into acked_next
Merge remote-tracking branch 'origin/next' into acked_next
wip: group_matrix debug / acknowledgement