Merge remote-tracking branch 'origin/rn-2014.3.1'

Conflicts:
	docs/index.rst