Merge remote-tracking branch 'origin/20140401-dev-stable'