According to http://www.w3.org/TR/css3-mediaqueries/#media1 both should be or-equal-to
Merge branch 'master' into gh-pages