Checkout
ljacomet
committed
on 31 Oct 13
merge from trunk up to r8412