Merge branch 'flycker-master'
...