Updated library source to 5026, Fixed transitional bugs
Merge remote-tracking branch 'origin/master'