Fix issues with mixed default/non-default context
Fix issues with mixed default/non-default context

dLobatog/janky,mattclark/janky,plataformatec/janky,evaautomation/janky,netflower/janky,digideskio/janky,OSS-TheWeatherCompany/janky,Kast0rTr0y/janky,Kast0rTr0y/janky,TheWeatherCompany/janky,dLobatog/janky,netflower/janky,fgbreel/janky,dLobatog/janky,mullingitover/janky,fgbreel/janky,mullingitover/janky,mullingitover/janky,cnbin/janky,mattclark/janky,digideskio/janky,Kast0rTr0y/janky,netflower/janky,github/janky,evaautomation/janky,mullingitover/janky,OSS-TheWeatherCompany/janky,TheWeatherCompany/janky,eLobato/janky,OSS-TheWeatherCompany/janky,digideskio/janky,fgbreel/janky,eLobato/janky,aergonaut/janky,cnbin/janky,plataformatec/janky,netflower/janky,evaautomation/janky,dLobatog/janky,eLobato/janky,aergonaut/janky,fgbreel/janky,mattclark/janky,plataformatec/janky,OSS-TheWeatherCompany/janky,github/janky,digideskio/janky,plataformatec/janky,github/janky,cnbin/janky,mattclark/janky,TheWeatherCompany/janky,evaautomation/janky,cnbin/janky,aergonaut/janky,eLobato/janky,Kast0rTr0y/janky,aergonaut/janky,TheWeatherCompany/janky