Merge upstream elite_api commits.

This commit is contained in:
Anna Rose 2016-01-21 22:35:15 -05:00
parent 647bbe3ebd
commit ba35a4f970

@ -1 +1 @@
Subproject commit 7078b7dc3801765d519586ba0b145f88b1e1447b Subproject commit 3e68516afd58a8afdb6f8db3c08d7515ac6d114a