Woo!
Merge branch 'refs/heads/master' into asia