Updated to 2014a from upstream
Updated to 2014b from upstream
Merge branch 'upstream' (early part)
Merge branch 'upstream'