Added a gradle property to ensure it to function on mac osx
Merge commit '0d3e9277b61a5f2d030fcbd886042e14b007dfb7'