Merge branch 'hotfix/72'

Close #74
Fixes #72

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.3 - TBD
+## 2.6.3 - 2016-02-23
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#74](https://github.com/zendframework/zend-mvc/pull/74) fixes the
+  `FormAnnotationBuilderFactory`'s usage of the
+  `FormElementManager::injectFactory()` method to ensure it works correctly on
+  all versions.
 
 ## 2.6.2 - 2016-02-22
 

src/Service/FormAnnotationBuilderFactory.php

@@ -29,7 +29,7 @@ public function createService(ServiceLocatorInterface $serviceLocator)
         //setup a form factory which can use custom form elements
         $annotationBuilder = new AnnotationBuilder();
         $formElementManager = $serviceLocator->get('FormElementManager');
-        $formElementManager->injectFactory($annotationBuilder);
+        $formElementManager->injectFactory($annotationBuilder, $serviceLocator);
 
         $config = $serviceLocator->get('Config');
         if (isset($config['form_annotation_builder'])) {