Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/hudson/plugins/disk_usage/DiskUsageBuildListener.java
Merge branch 'master' of https://github.com/mixalturek/disk-usage-plugin