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