Commited bug fix for issue where attributes were not working on the
cursor
Merge remote-tracking branch 'upstream/master'