Merge .htaccess changes from Drupal core update
Changes in test steps to avoid tests failing because of javascript
Merge pull request #18 from ratajczak/master

Changes in test steps to avoid tests failing because of javascript