
            Fix linting errors resulting from the merge with develop

0988a29