Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983373
rhbz983373 - de-reference obsolete variable when context change
Merge pull request #47 from zanata/rhbz983373-2

Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983373
Merge commit '927db71ba400871a8d913e9cf60f384a5b8f7d2d' into HEAD
Merge commit 'bf195b65f9fcdca5c1ed8ce527a749b6e0736f70' into HEAD