Merge branch 'master' into PR-2831-szpak
# Conflicts: # core/src/main/java/hudson/model/ViewGroupMixIn.java # test/src/test/java/hudson/model/ViewTest.java
Please register or sign in to comment
# Conflicts: # core/src/main/java/hudson/model/ViewGroupMixIn.java # test/src/test/java/hudson/model/ViewTest.java