Merge branch 'release/v2013.06.19'
Merge branch 'release/v2013.06.23'
Fix typo.
Don't run diff when changing tab focus

Don't run diff when changing tab focus if live mode is disabled
Merge branch 'feature/pr13' into develop