Merge branch 'master' into 0000-workbench-user-profile-wording-changes
authorWard Vandewege <ward@curoverse.com>
Thu, 22 Jan 2015 21:37:40 +0000 (16:37 -0500)
committerWard Vandewege <ward@curoverse.com>
Thu, 22 Jan 2015 21:37:40 +0000 (16:37 -0500)

Trivial merge