2013.09.18 (1.48d5)
Merge remote-tracking branch 'upstream/master'