Merge commit '1b7ffcf4957191cbd805a4863ece75cd549575e9' * commit '1b7ffcf4957191cbd805a4863ece75cd549575e9': Modify settings for 2.1
This commit is contained in:
Merge commit '1b7ffcf4957191cbd805a4863ece75cd549575e9' * commit '1b7ffcf4957191cbd805a4863ece75cd549575e9': Modify settings for 2.1