Trying to compile in travis, part 2
Trying to compile in travis, part 2


Former-commit-id: fe6c6c9b2979cc36673704364ca4d3103b675347
Former-commit-id: 2e5486bf760af672d289c58f6554fa41d3e97d6e
urinieto/msaf,urinieto/msaf