fix a bug where log.Ctx was not expanded + test
Merge branch 'master' of github.com:inconshreveable/log15