Merge remote-tracking branch 'origin/master' into mobile
authorrsiddharth <rsd@gnu.org>
Sun, 28 Feb 2016 14:48:04 +0000 (09:48 -0500)
committerrsiddharth <rsd@gnu.org>
Sun, 28 Feb 2016 14:48:04 +0000 (09:48 -0500)

Trivial merge