Revert "Merge branch master"

This reverts commit ec6d851bffd69feb57ca0a2a60b92782cc546394.