Merge branch '2884-improved-picker' closes #2884
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Jun 2014 20:36:01 +0000 (16:36 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Jun 2014 20:36:01 +0000 (16:36 -0400)

Trivial merge