Merge commit 'dedcfbd0' into development

 * Corrected the test expectation for test case test_examples.test_template_partial_extension().
   Though correct, the test now fails.

 * Did not include test case test_partial_sections() from the patch because
   the module examples.partial_section on which it depends seems to be missing.