branch
Merge branch 'mix_branch_20140427'
Merge branch 'master' of https://github.com/videostorm/mix