Updated
Merge branch '20141009155121518'