Fixing regression introduced by 288fa8be6f977694b7ada5d7f3f078975f3da38e
Merge pull request #215 from wmathurin/master

Fixing regression
Merge branch 'master' into unstable
Merge pull request #216 from bhariharan/unstable

Merge branch 'master' into unstable