Update config from master.

This commit is contained in:
Automated Commit 2015-08-04 08:00:14 -04:00
parent 26e590c779
commit 1c07ae3226

@ -1 +1 @@
Subproject commit 15d56c9cff20e9643f508639517846a423fb948c
Subproject commit 854a78548359e4fc44db6dca014469ff7a4b1bbb