Merge remote-tracking branch 'origin/nextRelease' into nr/MacOSX_fixes
commit47e3ce10c126ff0497af9c4b61104bb7a035eb9f
authorMartin Beaudoin <beaudoin.martin@gmail.com>
Thu, 22 Oct 2015 16:39:48 +0000 (22 12:39 -0400)
committerMartin Beaudoin <beaudoin.martin@gmail.com>
Thu, 22 Oct 2015 16:39:48 +0000 (22 12:39 -0400)
tree2ad20205a425654b0aaa5e294589741b22c89919
parentc2a0ba65397b7b4e626b18d599a5fc140555a242
parente596b6462cf7fae4a341bd431d94cbc1654a7d4f
Merge remote-tracking branch 'origin/nextRelease' into nr/MacOSX_fixes