Merge remote-tracking branch 'upstream/master'
authorSergey Kiselev <skiselev@gmail.com>
Wed, 11 Mar 2015 07:27:45 +0000 (00:27 -0700)
committerSergey Kiselev <skiselev@gmail.com>
Wed, 11 Mar 2015 07:27:45 +0000 (00:27 -0700)

Trivial merge