Moar updates to Master

Change-Id: Ie8a8cca2145126ac26a959f67ca0aa2f4b063e54