Merge tag 'upstream/3.0.717'
authorEmil Mikulic <emikulic@gmail.com>
Sun, 18 Aug 2013 06:34:48 +0000 (16:34 +1000)
committerEmil Mikulic <emikulic@gmail.com>
Sun, 18 Aug 2013 06:34:48 +0000 (16:34 +1000)
Upstream version 3.0.717


Trivial merge