Merge in Mosaik version, fdfe76f7f5a6dfd32072b5dd2616e445f047497e from Oct 29, 2013