viperfx Merge remote-tracking branch 'origin/master'

Latest commit e9fc7b1

Jul 28, 2014