Merge branch '2179-demo-feedback'
authorTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 02:55:57 +0000 (18:55 -0800)
committerTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 02:55:57 +0000 (18:55 -0800)
refs #2179


Trivial merge