Merge commit 'd074b686d4efc38a6b58d32aafc4ba891186f3d3' into HEAD
Updated known-good configurations with OpenSUSE 13.1 setup
Merge commit '169d894e2c7794c88427e06a0e8f412c49d6096c' into HEAD
Fixed windows errors.