Adding submodule.
Merge branch 'master' into 201206-stackoverflow_14630733