Merge branch 'rt_28256'
authorAlex Brelsfoard <alex@freeside.biz>
Mon, 26 Jan 2015 21:10:26 +0000 (16:10 -0500)
committerAlex Brelsfoard <alex@freeside.biz>
Mon, 26 Jan 2015 21:10:26 +0000 (16:10 -0500)

Trivial merge