T-310541 (https://appirio.my.salesforce.com/a42500000000DLV)
S-253735 (https://appirio.my.salesforce.com/a41500000000Ich)
Merge branch 'technology-2014-08-07'