update to 30 with cumulative patches
Merge pull request #115 from reallyenglish/tomoyukis

update to 30 with cumulative patches