- fix in log message
- fixed potential violations of document locking from cacheable document
Merge remote-tracking branch 'origin/feature-20140804-fix-android-scripts' into feature-20140804-settings-fix
Merge branch 'feature-20140804-settings-fix' into 20140401-dev-stable