diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ee424d5f47..2b49d4e0446 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Ansible Changes By Release
 ###Minor Changes:
 
 * If the user is not using paramiko or vault, allow Ansible to run if pycrypto is not installed.
+* Fixed a bug in pkg_util module that caused "update_catalog must be one of" error if 'update_catalog' arg was used.
 
 ## 2.1 "The Song Remains the Same" - ACTIVE DEVELOPMENT
 
@@ -167,7 +168,7 @@ Ansible Changes By Release
 
 ###Minor Changes:
 
-* Added support for pipelining mode to more connection plugins, which helps prevent 
+* Added support for pipelining mode to more connection plugins, which helps prevent
   module data from being written to disk.
 * Added a new '!unsafe' YAML decorator, which can be used in playbooks to ensure a
   string is not templated. For example: `foo: !unsafe "Don't template {{me}}"`.
diff --git a/lib/ansible/modules/core b/lib/ansible/modules/core
index bb8c19ba356..aa995806b9b 160000
--- a/lib/ansible/modules/core
+++ b/lib/ansible/modules/core
@@ -1 +1 @@
-Subproject commit bb8c19ba3560e32332da6ce777c9a3b0dd984ff3
+Subproject commit aa995806b9b5a41de4bd3d2a6ba917528fe8b6bb
diff --git a/lib/ansible/modules/extras b/lib/ansible/modules/extras
index 646880bf7ad..d1a4f703ce4 160000
--- a/lib/ansible/modules/extras
+++ b/lib/ansible/modules/extras
@@ -1 +1 @@
-Subproject commit 646880bf7adbe3d23835e5ba1bf677a642699df7
+Subproject commit d1a4f703ce493db6e0dfa8b37bb225ca7f53651c