...
Merge commit '24323dbc'
Fixing submodules
Readded monads
more option goodness less null
...
Merge remote-tracking branch 'origin/tablet-client'