Merge branch '4570-multi-auth-method' refs #4570
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 19:06:28 +0000 (14:06 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 19:06:46 +0000 (14:06 -0500)

Trivial merge