Merge branch 'master' into 'O0409'

doc/software-manual.tex

source/App/EncoderApp/EncApp.cpp

source/App/EncoderApp/EncAppCfg.cpp

source/App/EncoderApp/EncAppCfg.h

source/Lib/CommonLib/AdaptiveLoopFilter.cpp

source/Lib/CommonLib/AdaptiveLoopFilter.h

source/Lib/CommonLib/AlfParameters.h

source/Lib/CommonLib/CodingStructure.cpp

source/Lib/CommonLib/CommonDef.h

source/Lib/CommonLib/ContextModelling.cpp

source/Lib/CommonLib/ContextModelling.h

source/Lib/CommonLib/Contexts.cpp

source/Lib/CommonLib/Contexts.h

source/Lib/CommonLib/IntraPrediction.cpp

source/Lib/CommonLib/LoopFilter.cpp

source/Lib/CommonLib/LoopFilter.h

source/Lib/CommonLib/Picture.h

source/Lib/CommonLib/Slice.cpp

source/Lib/CommonLib/Slice.h

source/Lib/CommonLib/TrQuant.cpp