Consistent SDK ordering
Merge pull request #314 from everett-toews/consistent-sdk-order

Consistent SDK ordering