Merge branch freeze with branch unstable

20141001 - Merge of product
Merge of automation