Little derp fix
Merge branch 'jb-4.2' of github.com:zaclimon/impulse_ypg1 into jb-4.2