Merge remote-tracking branch 'refs/remotes/upstream/master' into rho
authorOlexa Bilaniuk <obilaniu@gmail.com>
Mon, 12 Jan 2015 16:59:38 +0000 (11:59 -0500)
committerOlexa Bilaniuk <obilaniu@gmail.com>
Mon, 12 Jan 2015 16:59:38 +0000 (11:59 -0500)

Trivial merge