merge derpies

Change-Id: Ic9a1bada69f896c4cffe3761b4256eab9636a2e2