Merge branch 'master' of ssh://gag.com/~keithp/telefiretwo