Trying to solve 1.8.1-dev problem
Merge remote-tracking branch 'origin/master'