Nice bit'o'flake
Merge pull request #926 from psav/flake_hopeful

Nice bit'o'flake