Merge remote-tracking branch 'spjoe/master' (closes PR #1921)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 8 Dec 2013 15:33:34 +0000 (16:33 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 8 Dec 2013 15:33:34 +0000 (16:33 +0100)

Trivial merge