Merge branch 'master' into collab/miker/sprint4 sprint4-merge-nov22
authorGalen Charlton <gmc@esilibrary.com>
Tue, 22 Nov 2016 21:11:55 +0000 (16:11 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Tue, 22 Nov 2016 21:11:55 +0000 (16:11 -0500)

Trivial merge