Merge branch 'master' into bug-311Jasmine test now pass