Bumping Ruby to 2.1.2 to resolve mavericks build issue
Merge branch 'hotfix/v1.5.1'