Updating Smashpig to master

Change-Id: I09b734403afec18633b64e59d264b2ff42da411b