Kitware/cinema — pull request #73 by demarle (2014-10-07 16:47:21+00:00)
Title: fix incorrect merge conflict resolution

I picked the wrong direction in 7f33fed4 and reintroduced removed
code.