Merge branch 'master' into intentions_rebased
Conflicts: lib/c/2014/test/test_labcomm_renaming_encoder.c lib/csharp/se/lth/control/labcomm2014/DecoderChannel.cs lib/csharp/se/lth/control/labcomm2014/EncoderChannel.cs
Conflicts: lib/c/2014/test/test_labcomm_renaming_encoder.c lib/csharp/se/lth/control/labcomm2014/DecoderChannel.cs lib/csharp/se/lth/control/labcomm2014/EncoderChannel.cs