Merge remote-tracking branch 'upstream/pr/1765' into qop
authorCory Benfield <lukasaoz@gmail.com>
Fri, 29 Nov 2013 16:44:13 +0000 (16:44 +0000)
committerCory Benfield <lukasaoz@gmail.com>
Fri, 29 Nov 2013 16:44:13 +0000 (16:44 +0000)

Trivial merge