I-132310
Merge branch 'technology-2014-10-02' into dev