merging master with 7.x-1.x