This should fix bitovi/canjs.com#62.
Merge branch 'master' of https://github.com/bitovi/shared-web