From 76080af7669058d8d6e101ba22d9150ca5f9fec7 Mon Sep 17 00:00:00 2001
From: "martin.holst@gmail.com"
 <martin.holst@gmail.com@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Thu, 19 Sep 2013 19:55:28 +0000
Subject: [PATCH] Final merge of trunk changes to scripting branch