OSDN Git Service

nvdajp/nvdajp.git
10 years agoadded jpAnsiEditbox option rather than guessing Unicode-like behavior by editAPIVersion jp2014.1 jpbeta140324
Takuya Nishimoto [Sun, 23 Mar 2014 14:44:16 +0000 (23:44 +0900)]
added jpAnsiEditbox option rather than guessing Unicode-like behavior by editAPIVersion

10 years agowork around issue with Winbiff (nvdajp ti33555) jpbeta140322
Takuya Nishimoto [Sat, 22 Mar 2014 14:09:14 +0000 (23:09 +0900)]
work around issue with Winbiff (nvdajp ti33555)

10 years agoreverted t3800 regarding ti33037 release-2014.1jp-140313
Takuya Nishimoto [Thu, 13 Mar 2014 02:18:09 +0000 (11:18 +0900)]
reverted t3800 regarding ti33037

10 years agoMerge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1
Takuya Nishimoto [Thu, 13 Mar 2014 01:10:03 +0000 (10:10 +0900)]
Merge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1

10 years agoBump version for 2014.1 final.
James Teh [Wed, 12 Mar 2014 23:39:08 +0000 (09:39 +1000)]
Bump version for 2014.1 final.

10 years agoMerge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1 jpbeta140310
Takuya Nishimoto [Mon, 10 Mar 2014 01:15:03 +0000 (10:15 +0900)]
Merge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1

10 years agol10n:
Mesar Hameed [Fri, 7 Mar 2014 21:35:57 +0000 (22:35 +0100)]
l10n:
fr - Fixed an important interface problem, an unmatched { broke the input gesture dialog

Thanks Michel Such.

10 years agoMerge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1
Takuya Nishimoto [Fri, 7 Mar 2014 04:35:56 +0000 (13:35 +0900)]
Merge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1

10 years agoUpdate eSpeak to 1.48.04 due to an important fix for Dutch.
James Teh [Fri, 7 Mar 2014 01:44:46 +0000 (11:44 +1000)]
Update eSpeak to 1.48.04 due to an important fix for Dutch.

10 years agoUpdate changes file to note eSpeak 1.48.03
Michael Curran [Wed, 5 Mar 2014 06:00:58 +0000 (16:00 +1000)]
Update changes file to note eSpeak 1.48.03

10 years agoMerge branch 'jpnext' into jp2014.1 jpbeta140305
Takuya Nishimoto [Wed, 5 Mar 2014 05:18:24 +0000 (14:18 +0900)]
Merge branch 'jpnext' into jp2014.1

10 years agoMerge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1
Takuya Nishimoto [Wed, 5 Mar 2014 05:15:44 +0000 (14:15 +0900)]
Merge branch 'rc' of git://git.nvaccess.org/nvda into jp2014.1

10 years agoMerge branch 't3860' into rc. Fixes #3860
Michael Curran [Wed, 5 Mar 2014 04:32:05 +0000 (14:32 +1000)]
Merge branch 't3860' into rc. Fixes #3860

10 years agoeSpeak: disable whole-program optimization as this was causing some distortion and...
Michael Curran [Wed, 5 Mar 2014 04:31:49 +0000 (14:31 +1000)]
eSpeak: disable whole-program optimization as this was causing some distortion and worbling on certain Klatt voices when compiled with msvc2012

10 years agoUpgrade eSpeak to 1.48.03 to fix badly compiled phonemedata Re #3860
Michael Curran [Wed, 5 Mar 2014 01:42:17 +0000 (11:42 +1000)]
Upgrade eSpeak to 1.48.03 to fix badly compiled phonemedata Re #3860

10 years agoMerge branch 'jp2014.1' into jpnext
Takuya Nishimoto [Mon, 3 Mar 2014 07:13:25 +0000 (16:13 +0900)]
Merge branch 'jp2014.1' into jpnext

10 years agomerged miscdepsjp master
Takuya Nishimoto [Mon, 3 Mar 2014 07:13:10 +0000 (16:13 +0900)]
merged miscdepsjp master

10 years agoMerge branch 'ti33037v2' into jpnext jpbeta140303
Takuya Nishimoto [Mon, 3 Mar 2014 01:33:39 +0000 (10:33 +0900)]
Merge branch 'ti33037v2' into jpnext

10 years agoMerge branch 'ti33260' into jpnext
Takuya Nishimoto [Mon, 3 Mar 2014 01:33:00 +0000 (10:33 +0900)]
Merge branch 'ti33260' into jpnext

10 years agoMerge branch 'jp2014.1' into jpnext
Takuya Nishimoto [Mon, 3 Mar 2014 01:32:35 +0000 (10:32 +0900)]
Merge branch 'jp2014.1' into jpnext

10 years agomerged miscdepjp master jpbeta140303s
Takuya Nishimoto [Mon, 3 Mar 2014 01:32:07 +0000 (10:32 +0900)]
merged miscdepjp master

10 years agoMerge branch 'jp2014.1' into jpnext
Takuya Nishimoto [Mon, 3 Mar 2014 01:30:32 +0000 (10:30 +0900)]
Merge branch 'jp2014.1' into jpnext

10 years agofixed issue in case the bottom line has no line ending characters jpbeta140302
Takuya Nishimoto [Sat, 1 Mar 2014 15:36:01 +0000 (00:36 +0900)]
fixed issue in case the bottom line has no line ending characters

10 years agorefactored
Takuya Nishimoto [Sat, 1 Mar 2014 15:24:59 +0000 (00:24 +0900)]
refactored

10 years agowork around ti33260
Takuya Nishimoto [Sat, 1 Mar 2014 15:18:15 +0000 (00:18 +0900)]
work around ti33260

10 years agowork around _getLineOffsets
Takuya Nishimoto [Sat, 1 Mar 2014 13:37:42 +0000 (22:37 +0900)]
work around _getLineOffsets

10 years agotest code regarding issue #3918 (nvdajp ti33260)
Takuya Nishimoto [Wed, 26 Feb 2014 06:23:56 +0000 (15:23 +0900)]
test code regarding issue #3918 (nvdajp ti33260)

10 years agoupdated miscdepsjp regarding ti31543 jpbeta140226
Takuya Nishimoto [Wed, 26 Feb 2014 02:51:42 +0000 (11:51 +0900)]
updated miscdepsjp regarding ti31543

10 years agoMerge commit 'fetch_head' into jp2014.1
Takuya Nishimoto [Mon, 24 Feb 2014 23:51:02 +0000 (08:51 +0900)]
Merge commit 'fetch_head' into jp2014.1

10 years agoFix tracking of the caret for some editable text fields that rely on text written...
Michael Curran [Fri, 21 Feb 2014 04:37:24 +0000 (14:37 +1000)]
Fix tracking of the caret for some editable text fields that rely on text written to the screen such as the main text area in Balabolka.

When fetching the caret rectangle for tracking in displayModel text, make an rpc call and use GetGUIThreadInfo in-process as Windows' logical to physical coordinate conversion is rather stuffed for cCaret.
Fixes #3901.

10 years agomerged origin t3800 jpbeta140223
Takuya Nishimoto [Sun, 23 Feb 2014 04:45:00 +0000 (13:45 +0900)]
merged origin t3800

10 years agoupdated miscdepjp jpbeta140221
Takuya Nishimoto [Fri, 21 Feb 2014 14:33:14 +0000 (23:33 +0900)]
updated miscdepjp

10 years agomerged origin master jpbeta140218
Takuya Nishimoto [Tue, 18 Feb 2014 12:45:22 +0000 (21:45 +0900)]
merged origin master

10 years agoupdated miscdepjp
Takuya Nishimoto [Tue, 18 Feb 2014 09:49:23 +0000 (18:49 +0900)]
updated miscdepjp

10 years agol10n:
Mesar Hameed [Tue, 18 Feb 2014 08:37:36 +0000 (09:37 +0100)]
l10n:
From translation svn 14389.

10 years agowork regarding mecab user dictionary jpbeta140217
Takuya Nishimoto [Mon, 17 Feb 2014 04:24:07 +0000 (13:24 +0900)]
work regarding mecab user dictionary

10 years agoNVDA no longer freezes when the Papenmeier BRAILLEX older models braille display...
Halim Sahin [Mon, 17 Feb 2014 03:47:52 +0000 (13:47 +1000)]
NVDA no longer freezes when the Papenmeier BRAILLEX older models braille display is selected without a display connected.

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Fri, 14 Feb 2014 13:00:52 +0000 (22:00 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agoA Papenmeier braille display can now be used even if a Papenmeier display has never...
Halim Sahin [Fri, 31 Jan 2014 04:26:24 +0000 (04:26 +0000)]
A Papenmeier braille display can now be used even if a Papenmeier display has never been connected via USB.

Fixes #3712.

10 years agocleanup miscdepjp
Takuya Nishimoto [Thu, 13 Feb 2014 08:51:49 +0000 (17:51 +0900)]
cleanup miscdepjp

10 years agoupdated readmejp
Takuya Nishimoto [Thu, 13 Feb 2014 08:28:02 +0000 (17:28 +0900)]
updated readmejp

10 years agoupdated readmejp
Takuya Nishimoto [Thu, 13 Feb 2014 04:19:27 +0000 (13:19 +0900)]
updated readmejp

10 years agoremoved menu items regarding nvdajp website jpbeta140212
Takuya Nishimoto [Tue, 11 Feb 2014 13:45:33 +0000 (22:45 +0900)]
removed menu items regarding nvdajp website

10 years agocosmetic changes regarding comments
Takuya Nishimoto [Tue, 11 Feb 2014 13:35:34 +0000 (22:35 +0900)]
cosmetic changes regarding comments

10 years agoupdated readmejp
Takuya Nishimoto [Tue, 11 Feb 2014 13:27:22 +0000 (22:27 +0900)]
updated readmejp

10 years agoupdated readmejp
Takuya Nishimoto [Tue, 11 Feb 2014 13:06:03 +0000 (22:06 +0900)]
updated readmejp

10 years agoupdated readmejp
Takuya Nishimoto [Tue, 11 Feb 2014 13:03:19 +0000 (22:03 +0900)]
updated readmejp

10 years agofixes ti33140 regarding command quick reference jpbeta140211
Takuya Nishimoto [Tue, 11 Feb 2014 09:11:37 +0000 (18:11 +0900)]
fixes ti33140 regarding command quick reference

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Tue, 11 Feb 2014 08:30:17 +0000 (17:30 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agoFix issues with application profile triggers when creating a virtual buffer fails.
James Teh [Mon, 27 Jan 2014 01:00:22 +0000 (01:00 +0000)]
Fix issues with application profile triggers when creating a virtual buffer fails.

If creating a virtual buffer failed in api.setFocusObject, the global focus variables weren't set, but application triggers were already exited/entered. This meant that next time the focus changed, NVDA tried to exit triggers that had already been exited. Also, there may have been triggers entered that were never exited.
Exceptions from treeInterceptorHandler.update are now caught. Also, the call to handleAppSwitch has been moved as late as possible so other exceptions don't cause this problem. Ideally, there aren't any other possible exceptions like this, but it's best to be safe.
Fixes #3804.

10 years agoSpecifically target Windows 8.1 (and other versions while we're at it) in NVDA's...
James Teh [Mon, 20 Jan 2014 04:26:53 +0000 (04:26 +0000)]
Specifically target Windows 8.1 (and other versions while we're at it) in NVDA's application manifest.

This means that correct Windows version information will be reported on Windows 8.1, rather than reporting as Windows 8.
Fixes #3793.

10 years agoOn systems with a high DPI display setting (which occurs by default for many modern...
James Teh [Tue, 11 Feb 2014 03:12:23 +0000 (13:12 +1000)]
On systems with a high DPI display setting (which occurs by default for many modern screens), NVDA no longer routes the mouse to the wrong location in some applications.

NVDA was made DPI aware to fix this.
Fixes #3758, #3703.

10 years agoEnglish What's New: Clarify the entry for #3757.
James Teh [Mon, 10 Feb 2014 23:57:40 +0000 (09:57 +1000)]
English What's New: Clarify the entry for #3757.

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Mon, 10 Feb 2014 05:22:16 +0000 (14:22 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agoProvide a quick fix to a crash in NVDA due to a bug shared between comtypes VARIANT...
Michael Curran [Mon, 10 Feb 2014 04:29:10 +0000 (14:29 +1000)]
Provide a quick fix to a crash in NVDA due to a bug shared between comtypes VARIANT implementation and ctypes callbacks. Re #3867

Stops crashes in NVDA's log viewer and in windbg, when either contains a large amount of text and then its some how updated.

10 years agoEnglish What's New: Fix typos and linguistic and formatting errors.
James Teh [Mon, 10 Feb 2014 04:05:32 +0000 (14:05 +1000)]
English What's New: Fix typos and linguistic and formatting errors.

Fixes #3865.

10 years agofixes translation of Contributors (nvdajp) jpbeta140210a
Takuya Nishimoto [Mon, 10 Feb 2014 03:20:39 +0000 (12:20 +0900)]
fixes translation of Contributors (nvdajp)

10 years agomerged origin master jpbeta140210
Takuya Nishimoto [Mon, 10 Feb 2014 02:39:47 +0000 (11:39 +0900)]
merged origin master

10 years agoA minidump is generated if NVDA crashes. Also, if NVDA has injected into a process...
James Teh [Mon, 10 Feb 2014 02:10:28 +0000 (12:10 +1000)]
A minidump is generated if NVDA crashes. Also, if NVDA has injected into a process, it can optionally generated a minidump if the process crashes.

Fixes #3851.

10 years agoUpgrade eSpeak to 1.48.02. Fixes #3842, #3739
Michael Curran [Mon, 10 Feb 2014 02:06:03 +0000 (12:06 +1000)]
Upgrade eSpeak to 1.48.02. Fixes #3842, #3739

10 years agosource readme: Linguistic and formatting fixes.
James Teh [Mon, 10 Feb 2014 01:58:50 +0000 (11:58 +1000)]
source readme: Linguistic and formatting fixes.

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Fri, 7 Feb 2014 11:21:57 +0000 (20:21 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agoDon't log "Writing minidump" before writing the minidump, as we want to do as little...
James Teh [Fri, 7 Feb 2014 11:17:20 +0000 (21:17 +1000)]
Don't log "Writing minidump" before writing the minidump, as we want to do as little as possible before the dump is written in case of instability.

I thought I'd already removed this, but apparently, I didn't.

10 years agol10n:
Mesar Hameed [Fri, 7 Feb 2014 10:18:00 +0000 (11:18 +0100)]
l10n:
From translation svn 14126.

10 years agoFix typo in changes.t2t
Mesar Hameed [Fri, 7 Feb 2014 08:24:36 +0000 (09:24 +0100)]
Fix typo in changes.t2t

10 years agochanged reading level of 'large circle' and 'saltire' from 'all' to 'some'
Takuya Nishimoto [Fri, 7 Feb 2014 06:43:08 +0000 (15:43 +0900)]
changed reading level of 'large circle' and 'saltire' from 'all' to 'some'

10 years agoWhen NVDA crashes and a dump is written, log the dump file path for convenience,...
James Teh [Fri, 7 Feb 2014 06:39:58 +0000 (16:39 +1000)]
When NVDA crashes and a dump is written, log the dump file path for convenience, even though it will always be the same.

10 years agowatchdog._crashHandler: Use GetCurrentThreadId() rather than possibly making Python...
James Teh [Fri, 7 Feb 2014 06:32:30 +0000 (16:32 +1000)]
watchdog._crashHandler: Use GetCurrentThreadId() rather than possibly making Python create a dummy thread object.

10 years agoMerge commit 'fetch_head' into jpbranch jpbeta140207
Takuya Nishimoto [Fri, 7 Feb 2014 05:37:15 +0000 (14:37 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agowork regarding characters u+25EF and u+2613
Takuya Nishimoto [Fri, 7 Feb 2014 05:33:25 +0000 (14:33 +0900)]
work regarding characters u+25EF and u+2613

10 years agogit: Ignore dump files.
James Teh [Fri, 7 Feb 2014 05:11:45 +0000 (15:11 +1000)]
git: Ignore dump files.

10 years agoMerge branch 'javaImprovements'. Fixes #3753, #3754, #3755, #3756, #3757, #3770
Michael Curran [Fri, 7 Feb 2014 04:38:45 +0000 (14:38 +1000)]
Merge branch 'javaImprovements'. Fixes #3753, #3754, #3755, #3756, #3757, #3770

10 years agoProvide the ability to request that a remote process write a minidump if it crashes...
James Teh [Fri, 7 Feb 2014 05:09:06 +0000 (15:09 +1000)]
Provide the ability to request that a remote process write a minidump if it crashes via AppModule.dumpOnCrash.

This should only be used if instructed by a developer.

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Thu, 6 Feb 2014 07:56:51 +0000 (16:56 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agoNVDA is now built with compiler optimizations turned off by default. Only a release...
Michael Curran [Thu, 6 Feb 2014 06:21:33 +0000 (16:21 +1000)]
NVDA is now built with compiler optimizations turned off by default. Only a release build gets optimizations now. This should   help with reading dumps from snapshots.

nvdaHelperDebugFlags now only contains debugCRT and RTC. symbols and noOptimize have been removed. noOptimize is by default, and release turns it off. We also always want symbols, there is no real need for it to be turned off as it does not affect code generation.

10 years agoWhen NVDA itself crashes, write a minidump in the same directory as the log file...
James Teh [Thu, 6 Feb 2014 03:52:50 +0000 (13:52 +1000)]
When NVDA itself crashes, write a minidump in the same directory as the log file called nvda_crash.dmp.

10 years agowork around issue ti33099 regarding speech/braille viewers
Takuya Nishimoto [Thu, 6 Feb 2014 02:09:12 +0000 (11:09 +0900)]
work around issue ti33099 regarding speech/braille viewers

10 years agoFix recent regression in IA2 live regions support where certain text was being announ...
Michael Curran [Wed, 5 Feb 2014 21:46:01 +0000 (07:46 +1000)]
Fix recent regression in IA2 live regions support where certain text was being announced even if aria-relevant was only additions.

Specifically:
* getTextFromIAccessible: add an includeTopLevelText argument (true by default) which controls whether text that is not an embedded object is included in the text collected.
* all calls to getTextFromIAccessible that use default argument values: don't specify the values.
* When adding text due to a text inserted or text updated event, only tell getTextFromIAccessible to include top level text if aria-relevant allows text.

10 years agoIA2 live region support: fix typo - actually do something for description change
Michael Curran [Wed, 5 Feb 2014 02:34:47 +0000 (12:34 +1000)]
IA2 live region support:  fix typo - actually do something for description change

10 years agoMerge branch 'jpbranch' into ti33071 jpbeta140204
Takuya Nishimoto [Tue, 4 Feb 2014 10:39:17 +0000 (19:39 +0900)]
Merge branch 'jpbranch' into ti33071

10 years agowork around controller client
Takuya Nishimoto [Tue, 4 Feb 2014 06:00:25 +0000 (15:00 +0900)]
work around controller client

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Tue, 4 Feb 2014 05:40:14 +0000 (14:40 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agodisable NVDA menu item checks. updated transparency
Takuya Nishimoto [Tue, 4 Feb 2014 03:05:40 +0000 (12:05 +0900)]
disable NVDA menu item checks. updated transparency

10 years agoAgain place 64-bit controllerClient libs in a subdir of x64. It was changed to x86_64...
Michael Curran [Tue, 4 Feb 2014 02:04:16 +0000 (12:04 +1000)]
Again place 64-bit controllerClient libs in a subdir of x64. It was changed to x86_64 around the time of moving to msvc 2012. Fixes #3796

10 years agoIAccessible NVDAObject's parent property: ensure windowObj is an IAccessible before...
Michael Curran [Mon, 3 Feb 2014 23:45:36 +0000 (09:45 +1000)]
IAccessible NVDAObject's parent property:  ensure  windowObj is an IAccessible before  fetching IAccessibleRole

10 years agoCtrl+A for 'select all' should work, so we must use rich text edit. experimental...
Takuya Nishimoto [Mon, 3 Feb 2014 14:15:17 +0000 (23:15 +0900)]
Ctrl+A for 'select all' should work, so we must use rich text edit. experimental use of transparency. smaller font size.

10 years agowork around speech/braille viewers.
Takuya Nishimoto [Mon, 3 Feb 2014 13:43:40 +0000 (22:43 +0900)]
work around speech/braille viewers.

10 years agochanged default (auto) synth driver to nvdajp_jtalk jpbeta140203
Takuya Nishimoto [Mon, 3 Feb 2014 10:07:44 +0000 (19:07 +0900)]
changed default (auto) synth driver to nvdajp_jtalk

10 years agoMerge commit 'fetch_head' into jpbranch
Takuya Nishimoto [Mon, 3 Feb 2014 09:35:41 +0000 (18:35 +0900)]
Merge commit 'fetch_head' into jpbranch

10 years agoFix a possible buffer overrun which may have caused a crash in MS Word (picked up...
Michael Curran [Sun, 2 Feb 2014 10:54:59 +0000 (20:54 +1000)]
Fix a possible buffer overrun which may have caused a crash in MS Word (picked up by MSVC RTC). Re #3785

VT_BOOL uses 16 bit values, so either VARIANT_BOOL or BOOL should be used. bool (c++) is only 8 bit which is not enough. The rest of calls with VT_BOOL were using BOOL 32 bit.

10 years agoMerge commit '46e02ea6'
Mesar Hameed [Sat, 1 Feb 2014 16:36:06 +0000 (17:36 +0100)]
Merge commit '46e02ea6'

10 years agol10n:
Mesar Hameed [Sat, 1 Feb 2014 10:33:15 +0000 (11:33 +0100)]
l10n:
From translation svn 14001.
Indonesian (id): translated: 570 fuzzy: 94 contributed: 2013-02-09.
Urdu (ur): translated: 288 fuzzy: 461 contributed: 2012-11-23.
Swedish (sv): translated: 1085 fuzzy: 134 contributed: 2014-02-01

10 years agol10n updates:
Mesar Hameed [Sat, 1 Feb 2014 08:43:08 +0000 (09:43 +0100)]
l10n updates:
From translation svn 13986.

10 years agoMerge branch 'master' of git://git.nvaccess.org/nvda into jpbranch jpbeta140131
Takuya Nishimoto [Fri, 31 Jan 2014 02:41:41 +0000 (11:41 +0900)]
Merge branch 'master' of git://git.nvaccess.org/nvda into jpbranch

10 years agoMerge branch 't3785'. Fixes #3785
Michael Curran [Fri, 31 Jan 2014 01:50:15 +0000 (11:50 +1000)]
Merge branch 't3785'. Fixes #3785

10 years agoMerge branch 't3781'. Fixes #3781
Michael Curran [Fri, 31 Jan 2014 01:40:11 +0000 (11:40 +1000)]
Merge branch 't3781'. Fixes #3781

10 years agoMerge branch 't3777'. Fixes #3777
Michael Curran [Fri, 31 Jan 2014 01:36:26 +0000 (11:36 +1000)]
Merge branch 't3777'. Fixes #3777

10 years agoMerge branch 'ia2LiveRegionImprovements'. Fixes #2640, #3329
Michael Curran [Fri, 31 Jan 2014 00:25:07 +0000 (10:25 +1000)]
Merge branch 'ia2LiveRegionImprovements'. Fixes #2640, #3329

10 years agoMerge branch 't1594'. Fixes #1594
Michael Curran [Fri, 31 Jan 2014 00:16:28 +0000 (10:16 +1000)]
Merge branch 't1594'. Fixes #1594

10 years agoUpdate changes
Michael Curran [Fri, 31 Jan 2014 00:08:59 +0000 (10:08 +1000)]
Update changes