Merge remote-tracking branch 'tilly-q/ticket-679'
authorRodney Ewing <ewing.rj@gmail.com>
Fri, 2 Aug 2013 14:28:35 +0000 (07:28 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Fri, 2 Aug 2013 14:28:35 +0000 (07:28 -0700)

Trivial merge