merged "feature-20140804-settings-fix" into "20140401-dev-stable"