.gitignore
Merge branch 'stable'
Minor fix for upward flow