Resyncing Dev and Master

Somehow dev got 6 commits behind master. Since Tile-CuratedList is even with Master, this should get everything marked as even. (Note that github says 0 files will change).