Upstream update 12.11.2014

Weekly update for tempest.