Merge branch 'release/20140807_Line_and_Ruby_updates'
Merge tag '20140807_Line_and_Ruby_updates' into develop

20140807_Line_and_Ruby_updates