Merge branch '20141105-journalissues' into staging

Conflicts:
	index.php