Merge from develop to master

Fully confirmed on TIAB. Let's see if we can do a Slugforge suite release tomorrow.
@Tapjoy/opsautomation