Merge remote-tracking branch 'upstream/master'
authormegustamucho <megustamucho@users.noreply.github.com>
Sat, 20 Sep 2014 12:41:45 +0000 (22:41 +1000)
committermegustamucho <megustamucho@users.noreply.github.com>
Sat, 20 Sep 2014 12:41:45 +0000 (22:41 +1000)

Trivial merge