updated submodules
Merge commit '2a11c6125f9d724646c806ac09542bc61aa965a6'

Conflicts:
	beaker-branches/release-0.15