Merge branch 'jchodera-fix-analyze'