merge

git-svn-id: http://observium.org/svn/observer/trunk@4517 61d68cd4-352d-0410-923a-c4978735b2b8