2014.08.07 (1.49f3)
Merge remote-tracking branch 'upstream/master'