Merge branch 'master' of https://github.com/Blahah/transrate into inline
Merge branch 'inline' of github.com:cboursnell/transrate into cboursnell-inline
Merge branch 'cboursnell-inline'