Merge Cyrodiil check into mainline

Author Sasky <sky42ks@gmail.com>
Author date 2014-06-12 04:54:46
Author local date 2014-06-11 21:54:46 -0700
Committer Sasky <sky42ks@gmail.com>
Committer date 2014-06-12 04:54:46
Committer local date 2014-06-11 21:54:46 -0700
Commit 34c331215b4d94fbdaa37a2ffd0dbed1663e719b
Tree 8783e0f7f4b5e0e022fcce0ab1c2eb1a396dc2dd
Parent 7bbf73117a818987a0aa8ba9171d856b5096d6b5
Merge Cyrodiil check into mainline