Kosmas/conductor — pull request #2 by morenoh149 (2014-02-07 22:50:13+00:00)
Title: Patch 1

merged upstream