tree a44448596507952663512fb3612b230f039a66e4
parent 00de42f9e3d400ca65515f57c183c01ce84ecc7f
parent 39259497f8ca0d624b10fade1237c78381619efb
author Scott Baker <smbaker@gmail.com> 1461788533 -0700
committer Scott Baker <smbaker@gmail.com> 1461788533 -0700

Merge remote-tracking branch 'origin/master' into feature/api-cleanup