Merge remote-tracking branch 'origin/master' into 1971-show-image-thumbnails
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Mar 2014 18:43:51 +0000 (13:43 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 7 Mar 2014 18:43:51 +0000 (13:43 -0500)

Trivial merge