Merge remote branch 'flameeyes/noundefined'