Code

Merge branch 'master' into lj/refs