2014.10.07 (1.49i13)
Merge remote-tracking branch 'upstream/master'