Merge remote-tracking branch 'origin/master'

Conflicts:
	euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>

euscanwww/djeuscan/processing/misc/update_portage_trees.py

@@ -112,11 +112,11 @@ def update_portage_trees(logger=None):
     logger = logger or FakeLogger()
     logger.info("Running emerge --sync")
     emerge_sync(logger)
+    emerge_metadata(logger)
     logger.info("Running layman --sync")
     layman_sync(logger, cache=True)
     #logger.info("Running emerge --regen")
     #emerge_regen(logger)
-    emerge_metadata(logger)
     logger.info("Running eix-update")
     eix_update(logger)
     logger.info("Done!")