Updating SmashPig to master

Change-Id: I01210c63f895428ba43ef9f4508318aa687a1212