Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

diff --cc core/producer/text/text_producer.cpp
Simple merge

diff --cc core/producer/text/text_producer.h
index a42c5183c1ae89d638fdf4c97f83592b8a63b679,6f7dfec459b2c3f87779f13e555d74e282212605..afbbc71aa9c360320184405a381abf141a31e9df
--- 1/core/producer/text/text_producer.h
--- 2/core/producer/text/text_producer.h
+++ b/core/producer/text/text_producer.h
@@@ -46,11 -46,9 +46,11 @@@ namespace caspar { namespace core 
  class text_producer : public frame_producer_base
  {
  public:
 -      text_producer(const spl::shared_ptr<frame_factory>& frame_factory, int x, int y, const std::wstring& str, const text::text_info& text_info, long parent_width, long parent_height);
 +      text_producer(const spl::shared_ptr<frame_factory>& frame_factory, int x, int y, const std::wstring& str, const text::text_info& text_info, long parent_width, long parent_height, bool standalone);
 +      static spl::shared_ptr<text_producer> create(const spl::shared_ptr<class frame_factory>& frame_factory, int x, int y, const std::wstring& str, const text::text_info& text_info, long parent_width, long parent_height, bool standalone = false);
 +      
        draw_frame receive_impl() override;
-       boost::unique_future<std::wstring> call(const std::wstring& param) override;
+       boost::unique_future<std::wstring> call(const std::vector<std::wstring>& param) override;
  
        text::string_metrics measure_string(const std::wstring& str);