merge with upstream
merge
add jasminejs console spec runner