Moar master syncs

Change-Id: I312be23dcbb0b628ee910dd81a372fff8be25356
Signed-off-by: DHO <DHO@dho.im>