Merge pull request #1692 from davidtme/master

Fix #1656 - Ruby compilation breaking when compiling dependant files