Try and fix problem with damn lambdas
Merge remote-tracking branch 'omarqureshi/master'