Manual merge of branch digineo:square_brackets, Issue #128