2013.9.18
Merge remote-tracking branch 'upstream/master'