Merge "master" of SkyFire repo