Updating SmashPig to master

Change-Id: I009f8eaef29e9b1937dcea5f477b86edf7e3c268