Merge gsteph 15 may 2014