wes' patch applied seperately
wes' patch applied seperately

stdweird/aquilon,quattor/aquilon,stdweird/aquilon,guillaume-philippon/aquilon,stdweird/aquilon,guillaume-philippon/aquilon,quattor/aquilon,quattor/aquilon,guillaume-philippon/aquilon