Fix awkward bug

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Update submodules

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Merge remote-tracking branch 'upstream/master'