Manually port f287bc76c0 to 2.6

Git won't let me merge the changes as I have 'unstaged changes'.
This commit is contained in:
mark_story 2014-05-27 20:54:36 -04:00
parent 587f2da09e
commit edcbf4e92f
3 changed files with 92 additions and 92 deletions