Merge pull request #377 from mhaskel/1.7.x-merge
authorColleen Murphy <cmurphy@users.noreply.github.com>
Mon, 27 Oct 2014 15:54:24 +0000 (08:54 -0700)
committerColleen Murphy <cmurphy@users.noreply.github.com>
Mon, 27 Oct 2014 15:54:24 +0000 (08:54 -0700)
commit7c71390cd15facf38ef7cc5718205d6811b936b6
treec48c26707f6ea988b1287bc319756ff709bb6011
parent43b894b12e53cb6943dfb936c5bdc700ee4997b2
parent2fdad79f74c4af95557f0522b4c90fa6d14084d9
Merge pull request #377 from mhaskel/1.7.x-merge

Merge master back into 1.7.x