merge facebook master

reviewer: @superdry