Update 15.04 3:20 AM
Merge remote-tracking branch 'vchat/master'
Update 15.04 3:20 AM