Ready for merge

Author Talen-Shei <none>
Author date 2015-08-10 07:51:55
Author local date 2015-08-10 00:51:55 -0700
Committer Talen-Shei <none>
Committer date 2015-08-10 07:51:55
Committer local date 2015-08-10 00:51:55 -0700
Commit 5d53e6eea37e09d30f320d7e5ba85214a5e29bc2
Tree 2d7fdf6332e584b9c30541d1cdd2a747021b342c
Parent f17d5c361b2a1f74c5f1be3407c5bd2c4be98a71
Ready for merge