Merge branch 'master' into Updates

Conflicts:
	sites/all/modules/libraries/tests/example/example_1.php
	sites/all/modules/libraries/tests/example/example_2.php

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc~HEAD

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc~HEAD~HEAD

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc~HEAD~master